diff options
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 6 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 1f2bb17df..22339bd87 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- use task-plasma-minimal instead of task-plasma5-minimal - fix bugs in any::sessions() (mga#33738) Version 18.69 - 07 June 2025 diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 7a04171cb..9a6552f2a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- use task-plasma-minimal instead of task-plasma5-minimal - use mutter with X11 backend - Create /etc while creating installer system - Adapt to latest gdk-pixbuf changes and use glycin to load images diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 4dc48acef..55985e01a 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-plasma5-minimal') && + my $tasks_ok = install::pkgs::packageByName($o->{packages}, 'task-plasma-minimal') && install::pkgs::packageByName($o->{packages}, 'task-gnome-minimal'); if ($tasks_ok && $availableC >= 2_500_000_000) { _chooseDesktop($o, $o->{rpmsrate_flags_chosen}, \$chooseGroups); @@ -452,7 +452,7 @@ sub _chooseDesktop { my ($o, $rpmsrate_flags_chosen, $chooseGroups) = @_; my @l = group_by2( - PLASMA5 => N("Plasma"), + PLASMA => N("Plasma"), GNOME => N("GNOME"), Custom => N("Custom"), ); @@ -471,7 +471,7 @@ sub _chooseDesktop { } my $desktop = $choice->[0]; log::l("chosen Desktop: $desktop"); - my @desktops = ('PLASMA5', 'GNOME'); + my @desktops = ('PLASMA', 'GNOME'); if (member($desktop, @desktops)) { my ($want, $dontwant) = ($desktop, grep { $desktop ne $_ } @desktops); $rpmsrate_flags_chosen->{"CAT_$want"} = 1; diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 66dbead65..6bcdbab7f 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -227,7 +227,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_PLASMA5"), + if_(!$do_pkgs->is_installed('task-plasma-minimal'), "CAT_PLASMA"), 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"), |