From 6f755af44bfea75dce261114dd6f12c0b2d862e9bd8ca895f9f475cc9fe34a9d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 29 Aug 2025 13:47:23 +0200 Subject: [PATCH 1/3] Recommend opensuse-welcome-launcher instead of opensuse-welcome: the launcher is the new tool that decides which welcome app (per desktop) to use (boo#1248327). --- patterns-xfce.changes | 7 +++++++ patterns-xfce.spec | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/patterns-xfce.changes b/patterns-xfce.changes index 1b051ef..9847fa5 100644 --- a/patterns-xfce.changes +++ b/patterns-xfce.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 20 06:47:21 UTC 2025 - Dominique Leuenberger + +- Recommend opensuse-welcome-launcher instead of opensuse-welcome: + the launcher is the new tool that decides which welcome app (per + desktop) to use (boo#1248327). + ------------------------------------------------------------------- Tue Aug 5 12:47:30 UTC 2025 - Takashi Iwai diff --git a/patterns-xfce.spec b/patterns-xfce.spec index 5f9984f..446303d 100644 --- a/patterns-xfce.spec +++ b/patterns-xfce.spec @@ -38,6 +38,7 @@ This particular package contains the Xfce patterns. ################################################################################ + %package xfce %pattern_graphicalenvironments Summary: XFCE Desktop Environment @@ -136,7 +137,7 @@ Recommends: gnome-keyring Recommends: gnome-keyring-pam # bnc#1108381 Recommends: gcr-ssh-askpass -Recommends: opensuse-welcome +Recommends: opensuse-welcome-launcher # from data/COMMON-DESKTOP-OPT # packages a GTK application @@ -232,7 +233,7 @@ Recommends: package-update-indicator Recommends: gnome-keyring Recommends: gcr-ssh-askpass Recommends: gnome-keyring-pam -Recommends: opensuse-welcome +Recommends: opensuse-welcome-launcher # Useful extras Recommends: gutenprint -- 2.51.1 From 11a6685a4034174366b1fd0783da5a4d6bad5c3d8e0a3c5668bc24d01e6d1817 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 29 Aug 2025 13:47:54 +0200 Subject: [PATCH 2/3] Only recommend opensuse-welcome-launcher on suse_version >= 1600. This pattern is also still used on Leap 15.6, where the switch to the flexible launcher is not planned to happen. --- patterns-xfce.changes | 7 +++++++ patterns-xfce.spec | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/patterns-xfce.changes b/patterns-xfce.changes index 9847fa5..175cadf 100644 --- a/patterns-xfce.changes +++ b/patterns-xfce.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 20 10:08:31 UTC 2025 - Dominique Leuenberger + +- Only recommend opensuse-welcome-launcher on suse_version >= 1600. + This pattern is also still used on Leap 15.6, where the switch to + the flexible launcher is not planned to happen. + ------------------------------------------------------------------- Wed Aug 20 06:47:21 UTC 2025 - Dominique Leuenberger diff --git a/patterns-xfce.spec b/patterns-xfce.spec index 446303d..2331d51 100644 --- a/patterns-xfce.spec +++ b/patterns-xfce.spec @@ -35,8 +35,6 @@ not make sense. This particular package contains the Xfce patterns. - - ################################################################################ %package xfce @@ -137,7 +135,11 @@ Recommends: gnome-keyring Recommends: gnome-keyring-pam # bnc#1108381 Recommends: gcr-ssh-askpass +%if 0%{?suse_version} >= 1600 Recommends: opensuse-welcome-launcher +%else +Recommends: opensuse-welcome +%endif # from data/COMMON-DESKTOP-OPT # packages a GTK application @@ -233,7 +235,11 @@ Recommends: package-update-indicator Recommends: gnome-keyring Recommends: gcr-ssh-askpass Recommends: gnome-keyring-pam +%if 0%{?suse_version} >= 1600 Recommends: opensuse-welcome-launcher +%else +Recommends: opensuse-welcome +%endif # Useful extras Recommends: gutenprint -- 2.51.1 From 5199929a2734ee3bbb5f08aba51b1584fb23fbb37118873eb40eb3ee5ab3b161 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 29 Aug 2025 13:48:26 +0200 Subject: [PATCH 3/3] Fix patterns for Wayland Move alsa-utils recommends from laptop_wayland to to basis_wayland patterns, as it's always used by labwc, not depending on laptop Clean up superfluous entries in laptop_wayland patterns that are already included in the basis pattern; xfce4-battery-plugin is dropped as xfce4-power-manager already provides the functionality (and it's not used as default) --- patterns-xfce.changes | 10 ++++++++++ patterns-xfce.spec | 13 ++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/patterns-xfce.changes b/patterns-xfce.changes index 175cadf..cb864d2 100644 --- a/patterns-xfce.changes +++ b/patterns-xfce.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 28 07:30:11 UTC 2025 - Takashi Iwai + +- Move alsa-utils recommends from laptop_wayland to to basis_wayland + patterns, as it's always used by labwc, not depending on laptop +- Clean up superfluous entries in laptop_wayland patterns that are + already included in the basis pattern; + xfce4-battery-plugin is dropped as xfce4-power-manager already + provides the functionality (and it's not used as default) + ------------------------------------------------------------------- Wed Aug 20 10:08:31 UTC 2025 - Dominique Leuenberger diff --git a/patterns-xfce.spec b/patterns-xfce.spec index 2331d51..11c580b 100644 --- a/patterns-xfce.spec +++ b/patterns-xfce.spec @@ -462,6 +462,8 @@ Requires: xfdesktop Recommends: xfce4-terminal Recommends: pavucontrol Recommends: xfce4-pulseaudio-plugin +# invoked from labwc keybinding +Recommends: alsa-utils # For screenlocking to work in xfce wayland Recommends: xfce4-screensaver @@ -530,18 +532,7 @@ Provides: patterns-openSUSE-xfce_laptop_wayland = %{version} Obsoletes: patterns-openSUSE-xfce_laptop_wayland < %{version} # Laptop-specific recommendations (Wayland safe) -Recommends: upower Recommends: brightnessctl -Recommends: xfce4-battery-plugin -Recommends: xfce4-power-manager -Recommends: xfce4-power-manager-plugin -Recommends: xfce4-pulseaudio-plugin -# invoked from labwc keybinding -Recommends: alsa-utils - -# Touchpad and input settings -Recommends: xfce4-settings -Recommends: xfce4-notifyd %description xfce_laptop_wayland XFCE Laptop configuration optimized for Wayland, including power management, -- 2.51.1