From d2428a8fc6656984d7050a91b6ef6578d05876e1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 23 Sep 2001 18:17:13 +0000
Subject: do not force X flag, have it selected for any "Graphical Environment"

---
 perl-install/install_any.pm    |  3 +--
 perl-install/share/compssUsers |  3 +++
 perl-install/share/rpmsrate    | 13 ++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 18bc4ead7..a6a37cd8b 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -361,14 +361,13 @@ sub setPackages {
 	}
 	if (!$o->{compssUsersChoice} && !$o->{isUpgrade}) {
 	    #- by default, choose:
-	    $o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG';
+	    $o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG', 'X';
 	    $o->{compssUsersChoice}{$_} = 1 
 	      foreach map { @{$o->{compssUsers}{$_}{flags}} } 'Workstation|Office Workstation', 'Workstation|Internet station';
 	}
 	$o->{compssUsersChoice}{uc($_)} = 1 foreach grep { modules::get_that_type($_) } ('tv', 'scanner', 'photo', 'sound');
 	$o->{compssUsersChoice}{uc($_)} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall();
 	$o->{compssUsersChoice}{SYSTEM} = 1;
-	$o->{compssUsersChoice}{X} = 1 if $o->{interactive};
 	$o->{compssUsersChoice}{BURNER} = 1 if detect_devices::burners();
 	$o->{compssUsersChoice}{DVD} = 1 if detect_devices::dvdroms();
 	$o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA();
diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
index 9513131fe..163a1e32d 100644
--- a/perl-install/share/compssUsers
+++ b/perl-install/share/compssUsers
@@ -52,12 +52,15 @@ Utilities [icon=configuration] [path=Workstation] [descr=Archiving, emulators, m
 
 KDE Workstation [icon=kde] [path=Graphical Environment] [descr=The K Desktop Environment, the basic graphical environment with a collection of accompanying tools]
 	KDE
+	X
 
 Gnome Workstation [icon=gnome] [path=Graphical Environment] [descr=A graphical environment with user-friendly set of applications and desktop tools]
 	GNOME
+	X
 
 Other Graphical Desktops [icon=windowmanager] [path=Graphical Environment] [descr=Icewm, Window Maker, Enlightenment, Fvwm, etc]
 	GRAPHICAL_DESKTOP
+	X
 
 
      # --- Development
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index 0d7828f71..15f60651d 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -279,19 +279,20 @@ ARCHIVING
 
 BURNER
   4 GNOME gnome-toaster gcombust
-  4 xcdroast
+  4 X xcdroast
   3 mkisofs cdrecord
-  2 eroaster 
+  2 X eroaster 
   DEVELOPMENT
     3 cdrecord-devel
 
 SCANNER
   5 sane-frontends
-  4 gimp
+  4 X gimp
+  2 X xsane
 
 PHOTO
-  4 gphoto
-  3 gnomemeeting openmcu
+  4 X gphoto
+  3 X gnomemeeting openmcu
 
 DATABASES
   5 postgresql
@@ -486,8 +487,6 @@ SYSTEM
 
   3 bc
   2 kernel-utils sane acpid adns audiofile freeswan awesfx fbset sudo vlan-utils
-  X 
-    2 xsane
   1 fdutils genromfs mailcap pinfo
 
   BOOKS 
-- 
cgit v1.2.1