/[packages]/cauldron/meta-task/current/SOURCES/compssUsers.pl

Diff of /cauldron/meta-task/current/SOURCES/compssUsers.pl

Parent Directory | Revision Log | View Patch Patch

-revision 338771 by tmb,
Fri Jan  4 21:47:17 2013 UTC
+revision 388363 by tv,
Tue Jan 15 17:39:20 2013 UTC
 Line 1
  package tmp::compssUsers;
  use common;
+ use install::pkgs;
  my $low_resources = detect_devices::has_low_resources();
  my $netbook_desktop = detect_devices::is_netbook_nettop();
-Line 17 
 N_("Workstation") =>
+Line 18 
 N_("Workstation") =>
        N_("Office programs: wordprocessors (LibreOffice Writer, Kword), spreadsheets (LibreOffice Calc, Kspread), PDF viewers, etc"),
      flags => [ qw(OFFICE SPELLCHECK PIM ARCHIVING ), if_(!$light_desktop, qw(PUBLISHING)) ],
      default_selected => 1,
+     required => [ qw(libreoffice-writer abiword) ],
    },
    if_(!$server,
    { label => N_("Game station"),
-Line 39 
 N_("Workstation") =>
+Line 41 
 N_("Workstation") =>
      descr => N_("Clients for different protocols including ssh"),
      flags => [ qw(NETWORKING_REMOTE_ACCESS NETWORKING_FILE) ],
      default_selected => $powerpack,
+     required => [ qw(openssh-clients samba-client) ],
    },
    { label => N_("Configuration"),
      descr => N_("Tools to ease the configuration of your computer"),
-Line 53 
 N_("Workstation") =>
+Line 56 
 N_("Workstation") =>
    { label => N_("Development"),
      descr => N_("C and C++ development libraries, programs and include files"),
      flags => [ qw(DEVELOPMENT EDITORS) ],
+     required => [ 'make' ],
    },
    { label => N_("Documentation"),
      descr => N_("Books and Howto's on Linux and Free Software"),
-Line 62 
 N_("Workstation") =>
+Line 66 
 N_("Workstation") =>
    { label => N_("LSB"),
      descr => N_("Linux Standard Base. Third party applications support"),
      flags => [ qw(LSB) ],
+     required => [ 'lsb-core' ],
    },
    ),
  ],
-Line 72 
 N_("Server") =>
+Line 77 
 N_("Server") =>
    { label => N_("Web Server"),
      descr => N_("Apache"),
      flags => [ qw(NETWORKING_WWW_SERVER) ],
+     required => [ qw(apache lftp mirrordir rsync) ],
    },
    { label => N_("Groupware"),
      descr => N_("Kolab Server"),
-Line 84 
 N_("Server") =>
+Line 90 
 N_("Server") =>
    { label => N_("Mail/News"),
      descr => N_("Postfix mail server, Inn news server"),
      flags => [ qw(NETWORKING_MAIL_SERVER NETWORKING_NEWS_SERVER) ],
+     required => [ 'postfix' ],
    },
    { label => N_("Directory Server"),
      descr => N_("LDAP Server"),
      flags => [ qw(NETWORKING_LDAP_SERVER) ],
+     required => [ 'openldap-servers' ],
    },
    { label => N_("FTP Server"),
      descr => N_("ProFTPd"),
      flags => [ qw(NETWORKING_FILE_TRANSFER_SERVER) ],
+     required => [ 'proftpd' ],
    },
    { label => N_("DNS/NIS"),
      descr => N_("Domain Name and Network Information Server"),
      flags => [ qw(NIS_SERVER NETWORKING_DNS_SERVER) ],
+     required => [ 'bind' ],
    },
    { label => N_("File and Printer Sharing Server"),
      descr => N_("NFS Server, Samba server"),
      flags => [ qw(NETWORKING_FILE_SERVER PRINTER) ],
+     required => [ qw(nfs-utils cups samba-server) ],
    },
    { label => N_("Database"),
      descr => N_("PostgreSQL and MariaDB Database Server"),
      flags => [ qw(DATABASES DATABASES_SERVER) ],
+     required => [ qw(postgresql9.1 postgresql9.2 mariadb) ],
    },
    ) : (
    { label => N_("Web/FTP"),
      descr => N_("Apache, Pro-ftpd"),
      flags => [ qw(NETWORKING_WWW_SERVER NETWORKING_FILE_TRANSFER_SERVER) ],
+     required => [ qw(apache proftpd rsync) ],
    },
    { label => N_("Mail"),
      descr => N_("Postfix mail server"),
      flags => [ qw(NETWORKING_MAIL_SERVER) ],
+     required => [ 'postfix' ],
    },
    { label => N_("Database"),
      descr => N_("PostgreSQL or MariaDB database server"),
      flags => [ qw(DATABASES DATABASES_SERVER) ],
+     required => [ qw(postgresql9.1 postgresql9.2 mariadb) ],
    },
    { label => N_("Firewall/Router"),
      descr => N_("Internet gateway"),
-Line 125 
 N_("Server") =>
+Line 140 
 N_("Server") =>
    { label => N_("Network Computer server"),
      descr => N_("NFS server, SMB server, Proxy server, ssh server"),
      flags => [ qw(NETWORKING_FILE_SERVER NETWORKING_REMOTE_ACCESS_SERVER) ],
+     required => [ qw(nfs-utils cups samba-server openssh-server) ],
    },
    ),
  ],
-Line 135 
 N_("Graphical Environment") =>
+Line 151 
 N_("Graphical Environment") =>
      descr => N_("The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"),
      flags => [ qw(KDE X ACCESSIBILITY THEMES) ],
      default_selected => !$light_desktop,
+     required => [ 'task-kde4-minimal' ],
    },
    { label => N_("GNOME Workstation"),
      descr => N_("A graphical environment with user-friendly set of applications and desktop tools"),
      flags => [ qw(GNOME X THEMES), if_(!$light_desktop, qw(ACCESSIBILITY)) ],
      default_selected => $netbook_desktop,
+     required => [ 'task-gnome-minimal' ],
    },
    { label => N_("LXDE Desktop"),
      flags => [ qw(LXDE X ACCESSIBILITY) ],
-Line 203 
 foreach my $path (keys %$h) {
+Line 221 
 foreach my $path (keys %$h) {
      }
  }
- my $compssUsers = [ map { @$_ } values %$h ];
+ sub _filter {
+     grep { $_->{required} ? install::pkgs::packageByName($::o->{packages}, $_->{required}) : 1 } map { @$_ } @_;
+ }
+ my $compssUsers = [ _filter(values %$h) ];
  my $gtk_display_compssUsers = sub {
      my ($entry) = @_;
-Line 215 
 my $gtk_display_compssUsers = sub {
+Line 237 
 my $gtk_display_compssUsers = sub {
      my $entries_in_path = sub {
          my ($path) = @_;
-         my @items = map { $entry->($_) } @{$h->{$path}};
+         my @items = map { $entry->($_) } @{ [ _filter($h->{$path}) ] };
          # ensure we have an even number of items:
          if (@items % 2) {

 Legend:



Removed from v.338771
 


changed lines


 
Added in v.388363
 Legend:



Removed from v.338771
 


changed lines


 
Added in v.388363
-Removed from v.338771
+Added in v.388363

	ViewVC Help
Powered by ViewVC 1.1.30