2004-09-30 Jeremy Katz <katzj@redhat.com>

	* installclasses/workstation.py:
	* installclasses/rhel_ws.py:
	Install compat-arch-support and compat-arch-devel-support
	by default (#133514).
	s/OpenOffice/OpenOffice.org/
	Mozilla isn't the web browser now.

	* installclasses/personal_desktop.py:
	* installclasses/server.py:
	* installclasses/rhel_as.py:
	* installclasses/rhel_es.py:
	* installclasses/rhel_desktop.py:
	Install compat-arch-support by default (#133514)
	s/OpenOffice/OpenOffice.org/
	Mozilla isn't the web browser now.

	* installclasses/rhel_ws.py:
	* installclasses/rhel_desktop.py:
	Should say OpenOffice.org, not OpenOffice.

7 files changed, 32 insertions, 24 deletions

diff --git a/installclasses/personal_desktop.py b/installclasses/personal_desktop.py
index 4fc14de36..6e6f25df7 100644
--- a/installclasses/personal_desktop.py
+++ b/installclasses/personal_desktop.py
@@ -17,7 +17,7 @@ class InstallClass(BaseInstallClass):
     
     pkgstext = N_("\tDesktop shell (GNOME)\n"
                   "\tOffice suite (OpenOffice.org)\n"
-                  "\tWeb browser (Mozilla) \n"
+                  "\tWeb browser \n"
                   "\tEmail (Evolution)\n"
                   "\tInstant messaging\n"
                   "\tSound and video applications\n"
@@ -42,6 +42,7 @@ class InstallClass(BaseInstallClass):
 
         grpset.selectGroup("workstation-common", asMeta = 1)
         grpset.selectGroup("gnome-desktop")
+        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
 
     def setInstallData(self, id):
 	BaseInstallClass.setInstallData(self, id)
diff --git a/installclasses/rhel_as.py b/installclasses/rhel_as.py
index d0fa6ea18..7ecf3446e 100644
--- a/installclasses/rhel_as.py
+++ b/installclasses/rhel_as.py
@@ -31,7 +31,8 @@ class InstallClass(BaseInstallClass):
         grpset.selectGroup("server", asMeta = 1)
         grpset.selectGroup("base-x")
         grpset.selectGroup("gnome-desktop")
-
+        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        
     def setInstallData(self, id):
 	BaseInstallClass.setInstallData(self, id)
         BaseInstallClass.setDefaultPartitioning(self, id.partitions,
diff --git a/installclasses/rhel_desktop.py b/installclasses/rhel_desktop.py
index 7bd01e472..0a110dbba 100644
--- a/installclasses/rhel_desktop.py
+++ b/installclasses/rhel_desktop.py
@@ -13,14 +13,13 @@ class InstallClass(BaseInstallClass):
     showLoginChoice = 0
     hidden = 1
 
-    pkgstext = _("\tDesktop shell (GNOME)\n"
-                 "\tOffice suite (OpenOffice)\n"
-                 "\tWeb browser (Mozilla) \n"
-                 "\tEmail (Evolution)\n"
-                 "\tInstant messaging\n"
-                 "\tSound and video applications\n"
-                 "\tGames\n"
-                 "\tAdministration Tools\n")
+    pkgstext = N_("\tDesktop shell (GNOME)\n"
+                  "\tOffice suite (OpenOffice.org)\n"
+                  "\tWeb browser \n"
+                  "\tEmail (Evolution)\n"
+                  "\tInstant messaging\n"
+                  "\tSound and video applications\n"
+                  "\tGames\n")
 
     def setSteps(self, dispatch):
 	BaseInstallClass.setSteps(self, dispatch);
@@ -33,7 +32,8 @@ class InstallClass(BaseInstallClass):
         grpset.unselectAll()
         grpset.selectGroup("workstation-common", asMeta = 1)
         grpset.selectGroup("gnome-desktop")        
-
+        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        
     def setInstallData(self, id):
 	BaseInstallClass.setInstallData(self, id)
         BaseInstallClass.setDefaultPartitioning(self, id.partitions,
diff --git a/installclasses/rhel_es.py b/installclasses/rhel_es.py
index 9d862ced0..d5ae444e2 100644
--- a/installclasses/rhel_es.py
+++ b/installclasses/rhel_es.py
@@ -31,7 +31,8 @@ class InstallClass(BaseInstallClass):
         grpset.selectGroup("server", asMeta = 1)
         grpset.selectGroup("base-x")        
         grpset.selectGroup("gnome-desktop")
-
+        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        
     def setInstallData(self, id):
 	BaseInstallClass.setInstallData(self, id)
         BaseInstallClass.setDefaultPartitioning(self, id.partitions,
diff --git a/installclasses/rhel_ws.py b/installclasses/rhel_ws.py
index 05b2d62e9..c981181d5 100644
--- a/installclasses/rhel_ws.py
+++ b/installclasses/rhel_ws.py
@@ -13,15 +13,15 @@ class InstallClass(BaseInstallClass):
     showLoginChoice = 0
     hidden = 1
 
-    pkgstext = _("\tDesktop shell (GNOME)\n"
-                 "\tOffice suite (OpenOffice)\n"
-                 "\tWeb browser (Mozilla) \n"
-                 "\tEmail (Evolution)\n"
-                 "\tInstant messaging\n"
-                 "\tSound and video applications\n"
-                 "\tGames\n"
-                 "\tSoftware Development Tools\n"
-                 "\tAdministration Tools\n")
+    pkgstext = N_("\tDesktop shell (GNOME)\n"
+                  "\tOffice suite (OpenOffice.org)\n"
+                  "\tWeb browser \n"
+                  "\tEmail (Evolution)\n"
+                  "\tInstant messaging\n"
+                  "\tSound and video applications\n"
+                  "\tGames\n"
+                  "\tSoftware Development Tools\n"
+                  "\tAdministration Tools\n")
 
     def setSteps(self, dispatch):
 	BaseInstallClass.setSteps(self, dispatch);
@@ -35,7 +35,9 @@ class InstallClass(BaseInstallClass):
         grpset.selectGroup("workstation-common", asMeta = 1)
         grpset.selectGroup("gnome-desktop")        
         grpset.selectGroup("development-tools")
-
+        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        grpset.selectGroup("compat-arch-development", asMeta = 1, missingOk = 1)
+        
     def setInstallData(self, id):
 	BaseInstallClass.setInstallData(self, id)
         BaseInstallClass.setDefaultPartitioning(self, id.partitions,
diff --git a/installclasses/server.py b/installclasses/server.py
index b18d4a480..4b724f071 100644
--- a/installclasses/server.py
+++ b/installclasses/server.py
@@ -28,6 +28,7 @@ class InstallClass(BaseInstallClass):
 
         grpset.unselectAll()
         grpset.selectGroup("server", asMeta = 1)
+        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
 
     def setInstallData(self, id):
 	BaseInstallClass.setInstallData(self, id)
diff --git a/installclasses/workstation.py b/installclasses/workstation.py
index 8857f7987..f93c87108 100644
--- a/installclasses/workstation.py
+++ b/installclasses/workstation.py
@@ -13,7 +13,7 @@ class InstallClass(personal_desktop.InstallClass):
 
     pkgstext = N_("\tDesktop shell (GNOME)\n"
                   "\tOffice suite (OpenOffice.org)\n"
-                  "\tWeb browser (Mozilla) \n"
+                  "\tWeb browser \n"
                   "\tEmail (Evolution)\n"
                   "\tInstant messaging\n"
                   "\tSound and video applications\n"
@@ -31,6 +31,8 @@ class InstallClass(personal_desktop.InstallClass):
         grpset.selectGroup("gnome-software-development")
 	grpset.selectGroup("x-software-development")
         grpset.selectGroup("development-tools")
-
+        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        grpset.selectGroup("compat-arch-development", asMeta = 1, missingOk = 1)
+        
     def __init__(self, expert):
 	personal_desktop.InstallClass.__init__(self, expert)