From c10791e1b7d4aacfd691dcea9a8085b513a84459 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Tue, 6 Sep 2005 15:34:32 +0000
Subject: - Install "desktop-printing" only on sytems with installed  
 gnome-panel, Discovery does not ship GNOME and also not desktop-printing.

---
 perl-install/printer/data.pm         | 12 ++++++++----
 perl-install/printer/printerdrake.pm |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'perl-install/printer')

diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm
index 41cf74660..5718d6c9b 100644
--- a/perl-install/printer/data.pm
+++ b/perl-install/printer/data.pm
@@ -7,7 +7,8 @@ use vars qw(@ISA @EXPORT);
 @ISA = qw(Exporter);
 @EXPORT = qw(%spoolers %spooler_inv %shortspooler_inv
 	     $kernelversion $usbprintermodule
-	     $commonpackages $gimpprintingpackages $localqueuepackages);
+	     $commonpackages $gimpprintingpackages $gnomecupspackages
+	     $localqueuepackages);
 
 
 # Kernel-specific data
@@ -25,6 +26,10 @@ our $commonpackages = [ [ 'foomatic-db-engine' ],
 our $gimpprintingpackages = [ [ 'gutenprint-gimp2' ], 
 			      [ '/usr/lib/gimp/2.0/plug-ins/print' ] ];
 
+# Packages which are needed for CUPS under GNOME
+our $gnomecupspackages = [ [ 'desktop-printing' ], 
+			   [ '/usr/bin/eggcups' ] ];
+
 # Packages which are needed to create and manage local print queues
 our $localqueuepackages = [ [ 'foomatic-filters', 'foomatic-db',
 			      'foomatic-db-hpijs', 'foomatic-db-engine',
@@ -122,14 +127,13 @@ our %spoolers = ('pdq' => {
 		     'boot_spooler' => 'cups',
 		     'service' => 'cups',
 		     'local_queues' => 1,
-		     'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers', 'gutenprint-cups', 'desktop-printing',
+		     'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers', 'gutenprint-cups',
 					  $::isInstall ? 'curl' : 'webfetch'],
 					 [ qw(/usr/lib/cups/cgi-bin/printers.cgi
 					      /sbin/ifconfig
 					      /usr/bin/xpp
 					      /usr/lib/cups/filter/rastertolxx74 
-					      /usr/lib/cups/filter/commandtoepson
-					      /usr/bin/eggcups),
+					      /usr/lib/cups/filter/commandtoepson),
 					   $::isInstall ||
 					   !(-x '/usr/bin/wget') ?
 					   '/usr/bin/curl' :
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 1950f14c2..8c9d73353 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -4617,6 +4617,10 @@ sub install_spooler {
 	push @{$packages->[0]}, @{$gimpprintingpackages->[0]};
 	push @{$packages->[1]}, @{$gimpprintingpackages->[1]};
     }
+    if (files_exist("/usr/bin/gnome-panel")) {
+	push @{$packages->[0]}, @{$gnomecupspackages->[0]};
+	push @{$packages->[1]}, @{$gnomecupspackages->[1]};
+    }
     if (@{$packages->[0]} && !files_exist(@{$packages->[1]})) {
 	undef $w;
         $w = $o_in && $o_in->wait_message(N("Printerdrake"), N("Installing %s..."), $spoolers{$spooler}{short_name});
-- 
cgit v1.2.1