summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnne Nicolas <ennael@mageia.org>2015-12-06 22:00:47 +0100
committerAnne Nicolas <ennael@mageia.org>2015-12-06 22:00:47 +0100
commit5b75810f331dc4a7f909fc32c09400a87c940fbe (patch)
treebe1fc0dd8b6c9e019cf2f13cab684be1099cb67c
parent7a87d3481df3f2651664bd9d569846eafe12cd62 (diff)
downloaddrakx-5b75810f331dc4a7f909fc32c09400a87c940fbe.tar
drakx-5b75810f331dc4a7f909fc32c09400a87c940fbe.tar.gz
drakx-5b75810f331dc4a7f909fc32c09400a87c940fbe.tar.bz2
drakx-5b75810f331dc4a7f909fc32c09400a87c940fbe.tar.xz
drakx-5b75810f331dc4a7f909fc32c09400a87c940fbe.zip
use task-plasma5 instead of task-kde4
-rw-r--r--perl-install/install/steps_interactive.pm2
-rw-r--r--perl-install/pkgs.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 3c2b2f591..c78535a37 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -387,7 +387,7 @@ sub choosePackages {
my ($individual, $chooseGroups);
if (!$o->{isUpgrade}) {
- my $tasks_ok = install::pkgs::packageByName($o->{packages}, 'task-kde4-minimal') &&
+ my $tasks_ok = install::pkgs::packageByName($o->{packages}, 'task-plasma5-minimal') &&
install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal');
if ($tasks_ok && $availableC >= 2_500_000_000) {
_chooseDesktop($o, $o->{rpmsrate_flags_chosen}, \$chooseGroups);
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 37ee16fc4..c4d25a582 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -219,7 +219,7 @@ sub detect_network_drivers {
sub detect_hardware_packages {
my ($do_pkgs, $o_match_all_hardware) = @_;
my @ignore_flags = $::isInstall ? () : (
- if_(!$do_pkgs->is_installed('task-plasma5-minimal'), "CAT_KDE"),
+ if_(!$do_pkgs->is_installed('task-plasma5-minimal'), "CAT_PLASMA5"),
if_(!$do_pkgs->is_installed('task-gnome-minimal'), "CAT_GNOME"),
if_(!$do_pkgs->is_installed('task-cinnamon-minimal'), "CAT_CINNAMON"),
if_(!$do_pkgs->is_installed('task-mate-minimal'), "CAT_MATE"),