Separate printing-related packages from INSTALL to create a new separated PRINTER group and pre-select them if OFFICE compssUser group is selected

4 files changed, 16 insertions, 8 deletions

diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
index 3f8f3a89d..0979ab70c 100644
--- a/perl-install/share/compssUsers
+++ b/perl-install/share/compssUsers
@@ -6,6 +6,7 @@ Office Workstation [icon=office] [path=Workstation] [selected=all] [descr=Office
 	PUBLISHING
 	PIM
 	ARCHIVING
+	PRINTER
 
 Game station [icon=arcade] [path=Workstation] [descr=Amusement programs: arcade, boards, strategy, etc]
 	GAMES
diff --git a/perl-install/share/compssUsers.desktop b/perl-install/share/compssUsers.desktop
index c3db2a286..b47df70d5 100644
--- a/perl-install/share/compssUsers.desktop
+++ b/perl-install/share/compssUsers.desktop
@@ -12,6 +12,7 @@ Office Workstation [icon=office] [path=Workstation] [selected=desktop] [descr=Of
 	SPELLCHECK
 	PUBLISHING
 	ARCHIVING
+	PRINTER
 
 Multimedia station [icon=multimedia] [path=Workstation] [selected=desktop] [descr=Sound and video playing/editing programs]
         AUDIO
diff --git a/perl-install/share/compssUsers.server b/perl-install/share/compssUsers.server
index 3367fa274..bff69b28a 100644
--- a/perl-install/share/compssUsers.server
+++ b/perl-install/share/compssUsers.server
@@ -50,6 +50,7 @@ DNS/NIS [icon=hardware] [path=Server] [descr=Domain Name and Network Information
 
 File & Printer Sharing Server [icon=archiving] [path=Server] [descr=NFS server, Samba server] 
 	NETWORKING_FILE_SERVER
+	PRINTER
 
 Database [icon=archiving] [path=Server] [descr=PostgreSQL or MySQL database server]
 	DATABASES
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index a74c49319..6e0b11e0f 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -197,6 +197,7 @@ NETWORKING_FILE_TRANSFER
 
 NETWORKING_FILE_TRANSFER_SERVER
   4 proftpd
+  3 proftpd-anonymous
   2 wu-ftpd anonftp
 
 NETWORKING_LDAP_SERVER
@@ -597,6 +598,8 @@ SYSTEM
   5 at MAKEDEV eject ldetect devfsd harddrake
     locales iputils urpmi cpio msec tmpwatch gnupg
 
+  5 lshw OpenIPMI dmidecode
+
   5 HIGH_SECURITY libsafe kernel-secure-2.4.22.6mdk kernel-secure-2.4.22.7mdk kernel-secure lads
   5 BIGMEM kernel-enterprise-2.4.22.6mdk kernel-enterprise-2.4.22.7mdk kernel-enterprise
   5 SMP kernel-smp-2.4.22.6mdk kernel-smp-2.4.22.7mdk kernel-smp
@@ -653,15 +656,9 @@ INSTALL
   5 pptp-adsl dhcpcd dhcpxd dhcp-client isdn4net isdn-light isdn4k-utils ibod rp-pppoe pump wireless-tools speedtouch
     ppp nfs-utils-clients libiw26 wireless-tools speedtouch eagle ppp-pppoe ppp-pppoatm
     autologin ntp cups-drivers samba-server ncpfs hpoj ucd-snmp libptal0
-    libhpojip0 libsnmp0 xojpanel libsane-hpoj1 usbutils
     shorewall iptables printer-utils samba-client
-    xpp printer-testpages nmap scli net-tools
-    ipchains 
-    cups gimpprint
-    foomatic-db-engine foomatic-filters foomatic-db
-    nc sndconfig 
-    ImageMagick ghostscript printer-filters mpage a2ps ppdfilt libppd1 gpr groff libgimpprint1 numlock curl
-    sane-backends sane-frontends xsane xsane-gimp mtools mtoolsfm
+    ipchains nc sndconfig curl
+    mtools mtoolsfm numlock usbutils
     hotplug ypbind speedtouch_mgmt
     tmdns zcip acpi acpid
   4 XFree86-SVGA XFree86-server XFree86-Mach64 XFree86-FBDev
@@ -669,3 +666,11 @@ INSTALL
   3 XFree86-S3 XFree86-S3V XFree86-VGA16
   2 XFree86-8514 XFree86-AGX XFree86-I128 XFree86-Mach32 XFree86-Mach8 XFree86-Mono XFree86-P9000 XFree86-W32
   1 XFree86-3DLabs
+
+PRINTER
+  5 xpp printer-testpages nmap scli net-tools cups gimpprint foomatic-db-engine 
+    foomatic-filters foomatic-db ImageMagick ghostscript printer-filters mpage 
+    a2ps ppdfilt libppd gpr groff libgimpprint
+    sane-backends sane-frontends xsane xsane-gimp 
+    libhpojip libsnmp xojpanel libsane-hpoj
+