From 0dbbdab204e7257e44295c769c8da4a96f0e96a1 Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: Nov 02 2011 15:12:26 +0000
Subject: Fixed the subscription-* packages in the tools/compsgen.sh and in the comps.xml for 6.1


---

diff --git a/c6-i386-comps.xml b/c6-i386-comps.xml
index 3cea989..943c98c 100644
--- a/c6-i386-comps.xml
+++ b/c6-i386-comps.xml
@@ -855,7 +855,6 @@
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
       <packagereq type="default">rhn-setup-gnome</packagereq>
-      <packagereq type="default">subscription-manager-gnome</packagereq>
       <packagereq type="default">vino</packagereq>
       <packagereq type="optional">sabayon-apply</packagereq>
       <packagereq type="optional">tigervnc-server</packagereq>
@@ -2128,7 +2127,6 @@
       <packagereq type="mandatory">selinux-policy-targeted</packagereq>
       <packagereq type="mandatory">setup</packagereq>
       <packagereq type="mandatory">shadow-utils</packagereq>
-      <packagereq type="mandatory">subscription-manager</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">util-linux-ng</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
@@ -11492,7 +11490,6 @@
       <packagereq type="default">hal</packagereq>
       <packagereq type="default">plymouth-system-theme</packagereq>
       <packagereq type="default">spice-vdagent</packagereq>
-      <packagereq type="default">subscription-manager-firstboot</packagereq>
       <packagereq type="default">wacomexpresskeys</packagereq>
       <packagereq type="default">xorg-x11-server-utils</packagereq>
       <packagereq type="default">xorg-x11-utils</packagereq>
diff --git a/c6-x86_64-comps.xml b/c6-x86_64-comps.xml
index fcabf32..95ebaae 100644
--- a/c6-x86_64-comps.xml
+++ b/c6-x86_64-comps.xml
@@ -855,7 +855,6 @@
       <packagereq type="default">pulseaudio-module-gconf</packagereq>
       <packagereq type="default">pulseaudio-module-x11</packagereq>
       <packagereq type="default">rhn-setup-gnome</packagereq>
-      <packagereq type="default">subscription-manager-gnome</packagereq>
       <packagereq type="default">vino</packagereq>
       <packagereq type="optional">sabayon-apply</packagereq>
       <packagereq type="optional">tigervnc-server</packagereq>
@@ -2127,7 +2126,6 @@
       <packagereq type="mandatory">selinux-policy-targeted</packagereq>
       <packagereq type="mandatory">setup</packagereq>
       <packagereq type="mandatory">shadow-utils</packagereq>
-      <packagereq type="mandatory">subscription-manager</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">util-linux-ng</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
@@ -11500,7 +11498,6 @@
       <packagereq type="default">hal</packagereq>
       <packagereq type="default">plymouth-system-theme</packagereq>
       <packagereq type="default">spice-vdagent</packagereq>
-      <packagereq type="default">subscription-manager-firstboot</packagereq>
       <packagereq type="default">wacomexpresskeys</packagereq>
       <packagereq type="default">xorg-x11-server-utils</packagereq>
       <packagereq type="default">xorg-x11-utils</packagereq>
diff --git a/tools/compsgen.sh b/tools/compsgen.sh
index 989b0d8..7c17cfc 100755
--- a/tools/compsgen.sh
+++ b/tools/compsgen.sh
@@ -231,7 +231,9 @@ echo "</comps>" >> $outputxml
 sed -i s/"Red Hat Enterprise Linux"/"CentOS Linux"/g $outputxml
 sed -i s/"redhat-indexhtml"/"centos-indexhtml"/g $outputxml
 sed -i '/Red_Hat_Enterprise_Linux-Release_Notes/d' $outputxml
-
+sed -i '/subscription-manager-gnome/d' $outputxml
+sed -i '/subscription-manager/d' $outputxml
+sed -i '/subscription-manager-firstboot/d' $outputxml
 }