From 4834e8abc569b1a9ad5742bd5ae383d869f81615d25078b6469f20541b1db232 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Apr 2020 17:36:37 +0000 Subject: [PATCH] Accepting request 796146 from home:qzhao:branches:GNOME:Factory Update gnome-initial-setup.spec: Drop the is_opensuse macro to eliminate in behavior in between SLE-15 and openSUSE-Leap (jsc#SLE-11857). OBS-URL: https://build.opensuse.org/request/show/796146 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-initial-setup?expand=0&rev=77 --- gnome-initial-setup.changes | 7 +++++++ gnome-initial-setup.spec | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gnome-initial-setup.changes b/gnome-initial-setup.changes index 79bbc49..b4fb50e 100644 --- a/gnome-initial-setup.changes +++ b/gnome-initial-setup.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 15 06:18:12 UTC 2020 - Cliff Zhao + +- Update gnome-initial-setup.spec: Drop the is_opensuse macro to + eliminate in behavior in between SLE-15 and openSUSE-Leap + (jsc#SLE-11857). + ------------------------------------------------------------------- Sat Mar 28 16:48:16 UTC 2020 - Bjørn Lie diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 380aa24..008eb41 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -69,7 +69,7 @@ Initial assistant, helping you to get the system up and running. %prep %setup -q -%if !0%{?is_opensuse} +%if 0%{?sle_version} >= 150200 %patch0 -p1 %endif @@ -82,7 +82,7 @@ Initial assistant, helping you to get the system up and running. %install %meson_install -%if !0%{?is_opensuse} +%if 0%{?sle_version} >= 150200 rm -rf %{buildroot}%{_libexecdir}/gnome-welcome-tour rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop %endif @@ -119,7 +119,7 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} || : %{_userunitdir}/gnome-session.target.wants/gnome-welcome-tour.service %dir %{_userunitdir}/gnome-session@gnome-initial-setup.target.wants %{_userunitdir}/gnome-session@gnome-initial-setup.target.wants/gnome-initial-setup.service -%if 0%{?is_opensuse} +%if 0%{?sle_version} < 150200 %{_libexecdir}/gnome-welcome-tour %{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop %endif