Accepting request 1311504 from X11:Utilities

- Make opensuse-welcome-launcher support a --unconditional
  parameter and launch it using this parameter when called via the
  desktop file from the launcher. Fixes the issue that the icon
  shown in the launcher did not actually start anything.

OBS-URL: https://build.opensuse.org/request/show/1311504
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-welcome-launcher?expand=0&rev=4

opensuse-welcome-launcher.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Oct  6 16:04:22 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Make opensuse-welcome-launcher support a --unconditional
+  parameter and launch it using this parameter when called via the
+  desktop file from the launcher. Fixes the issue that the icon
+  shown in the launcher did not actually start anything.
+
+-------------------------------------------------------------------
+Thu Oct  2 13:28:22 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Be less hacky about the fallback, but rather explicitly assign
+  opensuse-welcome to KDE for now and switch GNOME to gnome-tour.
+- Require gnome-tour when gnome-session is installed.
+
 -------------------------------------------------------------------
 Tue Aug 19 07:46:04 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
 

opensuse-welcome-launcher.sh

@@ -13,7 +13,7 @@ if [[ -e "$HOME/.config/autostart/${LEGACY_XDG_FILE}" && \
 fi
 
 # Show only once per version
-if [ -f ${HOME}/.local/share/opensuse-welcome/launched ]; then
+if [ "$1" != "--unconditional" -a -f ${HOME}/.local/share/opensuse-welcome/launched ]; then
   if [ "$(cat ${HOME}/.local/share/opensuse-welcome/launched)" = "${OSWL_VERSION_TAG}" ]; then
     # We have already shown the laucher at this version - skipping
     exit 0
@@ -38,7 +38,7 @@ welcome_binary=""
 
 # Prefer Session specific greeter
 if [[ "$de" == *plasma* ]]; then
-    welcome_binary=$(command -v plasma-welcome)
+    welcome_binary=$(command -v opensuse-welcome)
 elif [[ "$de" == *gnome* ]]; then
     welcome_binary=$(command -v gnome-tour)
 fi
@@ -48,11 +48,6 @@ if [ -z "$welcome_binary" ]; then
     welcome_binary=$(command -v opensuse-welcome)
 fi
 
-# XXX: hack for the initial integration
-# keep legacy behavior and only trigger opensuse-welcome
-# rest would be the next step
-welcome_binary=$(command -v opensuse-welcome)
-
 if [ ! -z "$welcome_binary" ]; then
     $welcome_binary
 fi

opensuse-welcome-launcher.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package opensuse-welcome-launcher
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,13 +25,14 @@ Group:          System/X11/Utilities
 URL:            https://github.com/openSUSE/openSUSE-welcome
 Source0:        opensuse-welcome-launcher.sh
 # Original filename was org.opensuse.opensuse_welcome.desktop
-Source1:        org.opensuse.opensuse_welcome_launcher.desktop
+Source1:        org.opensuse.opensuse_welcome_launcher.desktop.in
 Source3:        org.opensuse.opensuse_welcome_launcher.svg
 Source4:        org.opensuse.opensuse_welcome_launcher-symbolic.svg
 Recommends:     opensuse-welcome >= 0.1.10
+Requires:       (gnome-tour if gnome-session)
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  hicolor-icon-theme-branding-openSUSE
-BuildArch: noarch
+BuildArch:      noarch
 
 %description
 A simple wrapper to spawn relevant welcome tool on given desktop
@@ -53,8 +54,10 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
 install -m 0755 %{SOURCE0} %{buildroot}%{_bindir}/opensuse-welcome-launcher
 
 # Install desktop entries
-install -m 0644 %{SOURCE1} %{buildroot}%{_distconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop
-install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/org.opensuse.opensuse_welcome_launcher.desktop
+install -d -m 0755 %{buildroot}%{_distconfdir}/xdg/autostart
+sed "s|@PARAMS@||g" %{SOURCE1} > %{buildroot}%{_distconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop
+install -d -m 0755 %{buildroot}%{_datadir}/applications
+sed "s|@PARAMS@| --unconditional|g" %{SOURCE1} > %{buildroot}%{_datadir}/applications/org.opensuse.opensuse_welcome_launcher.desktop
 
 # Install icons
 install -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.opensuse.opensuse_welcome_launcher.svg
@@ -67,4 +70,5 @@ install -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/o
 %dir %{_datadir}/opensuse-welcome-launcher
 %{_datadir}/icons/hicolor/scalable/apps/org.opensuse.opensuse_welcome_launcher.svg
 %{_datadir}/icons/hicolor/symbolic/apps/org.opensuse.opensuse_welcome_launcher-symbolic.svg
+
 %changelog

org.opensuse.opensuse_welcome_launcher.desktop.in

@@ -2,7 +2,7 @@
 [Desktop Entry]
 Type=Application
 Name=Welcome launcher
-Exec=/usr/bin/opensuse-welcome-launcher
+Exec=/usr/bin/opensuse-welcome-launcher@PARAMS@
 Icon=org.opensuse.opensuse_welcome_launcher
 Comment=The openSUSE Welcome launcher utility.
 Categories=Qt;System;Documentation