Updated automatic package installation in printerdrake, no "kups" and "qtcups" any more, but "gpr", "a2ps", and "hpoj", updated also "rpmsrate" and "rpmsrate.server" appropriately.

3 files changed, 21 insertions, 21 deletions

diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index d1aa9d851..8cdd5c3cc 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -1532,7 +1532,7 @@ sub printer_help {
     my $dialogtext;
     if ($spooler eq "cups") {
 	$dialogtext =
-_("To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"qtcups <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily.
+_("To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"kprinter <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily.
 ", ($queue ne $default ? "lpr -P $queue" : "lpr")) .
 _("These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application.
 ") .
@@ -1880,15 +1880,11 @@ sub install_spooler {
 		if ((!$::testing) &&
 		    (!printer::files_exist((qw(/usr/lib/cups/cgi-bin/printers.cgi
 					       /sbin/ifconfig
-					       /usr/bin/xpp
-					       /usr/bin/qtcups),
-					    (printer::files_exist("/usr/bin/kwin")?
-					     "/usr/bin/kups" : ()),
+					       /usr/bin/xpp),
 					    ($::expert ? 
 					     "/usr/share/cups/model/postscript.ppd.gz" : ())
 					    )))) {
-		    $in->do_pkgs->install(('cups', 'net-tools', 'xpp', 'qtcups', 
-					   if_($in->do_pkgs->is_installed('kdebase'), 'kups'),
+		    $in->do_pkgs->install(('cups', 'net-tools', 'xpp',
 					   ($::expert ? 'cups-drivers' : ())));
 		}
 		# Start daemon
@@ -1918,8 +1914,11 @@ sub install_spooler {
 		if ((!$::testing) &&
 		    (!printer::files_exist((qw(/usr/sbin/lpf
 					       /usr/sbin/lpd
-					       /sbin/ifconfig))))) {
-		    $in->do_pkgs->install(('lpr', 'net-tools'));
+					       /sbin/ifconfig
+					       /usr/bin/gpr
+					       /usr/bin/a2ps
+					       /usr/bin/convert))))) {
+		    $in->do_pkgs->install(('lpr', 'net-tools', 'gpr', 'a2ps', 'ImageMagick'));
 		}
 		# Start daemon
 	        printer::restart_service("lpd");
@@ -1945,8 +1944,11 @@ sub install_spooler {
 		if ((!$::testing) &&
 		    (!printer::files_exist((qw(/usr/lib/filters/lpf
 					       /usr/sbin/lpd
-					       /sbin/ifconfig))))) {
-		    $in->do_pkgs->install('LPRng', 'net-tools');
+					       /sbin/ifconfig
+					       /usr/bin/gpr
+					       /usr/bin/a2ps
+					       /usr/bin/convert))))) {
+		    $in->do_pkgs->install('LPRng', 'net-tools', 'gpr', 'a2ps', 'ImageMagick');
 		}
 		# Start daemon
 	        printer::restart_service("lpd");
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index 876ca7a7b..a42d6f7db 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -87,7 +87,6 @@ PUBLISHING
 
   5 CUPS 
       cups-drivers xpp
-      KDE kups
   5 CUPS || LPR foomatic
   1 CUPS hpoj
 
@@ -521,10 +520,10 @@ INSTALL
     XFree86 XFree86-glide-module Device3Dfx Glide_V3-DRI Glide_V5 Mesa
     XFree86-3DLabs XFree86-FBDev
     kernel kernel-smp kernel-enterprise kernel22 kernel22-smp kernel22-secure 
-    autologin ntp cups-drivers lpr samba ncpfs ghostscript-utils
+    autologin ntp cups-drivers lpr samba ncpfs hpoj ucd-snmp libptal0
     reiserfsprogs jfsprogs xfsprogs ipchains printer-utils rlpr samba-client ncpfs nc
-    xpp LPRng pdq kups printer-testpages 
+    xpp LPRng pdq printer-testpages 
     autologin ntp ipchains lvm
     cups LPRng lpr pdq foomatic printer-utils printer-testpages gimpprint xpp 
-    qtcups kups cups-drivers rlpr samba samba-common samba-client ncpfs nc 
-    ImageMagick ghostscript printer-filters mpage libgimpprint4 numlock
+    cups-drivers rlpr samba samba-common samba-client ncpfs nc 
+    ImageMagick ghostscript printer-filters mpage a2ps ppdfilt libppd1 gpr groff libgimpprint1 numlock
diff --git a/perl-install/share/rpmsrate.server b/perl-install/share/rpmsrate.server
index c56e05dad..39fd8d2c5 100644
--- a/perl-install/share/rpmsrate.server
+++ b/perl-install/share/rpmsrate.server
@@ -36,7 +36,6 @@ PUBLISHING
 
   5 CUPS 
       cups-drivers xpp
-      KDE kups
   5 CUPS || LPR foomatic
   1 CUPS hpoj
 
@@ -453,10 +452,10 @@ INSTALL
     XFree86 XFree86-glide-module Device3Dfx Glide_V3-DRI Glide_V5 Mesa
     XFree86-3DLabs XFree86-FBDev
     kernel kernel-smp kernel-enterprise kernel22 kernel22-smp kernel22-secure 
-    autologin ntp cups-drivers lpr samba ncpfs ghostscript-utils
+    autologin ntp cups-drivers lpr samba ncpfs hpoj ucd-snmp libptal0
     reiserfsprogs jfsprogs xfsprogs ipchains printer-utils rlpr samba-client ncpfs nc
-    xpp LPRng pdq kups printer-testpages 
+    xpp LPRng pdq printer-testpages 
     autologin ntp ipchains lvm
     cups LPRng lpr pdq foomatic printer-utils printer-testpages gimpprint xpp 
-    qtcups kups cups-drivers rlpr samba samba-common samba-client ncpfs nc 
-    ImageMagick ghostscript printer-filters mpage libgimpprint4 numlock
+    cups-drivers rlpr samba samba-common samba-client ncpfs nc 
+    ImageMagick ghostscript printer-filters mpage a2ps ppdfilt libppd1 gpr groff libgimpprint1 numlock