From 7a233e2cfcb7f4c4645f68f936b860c2e6b70653dbc5f96a8e15d8b50d7473d0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 20 Jul 2020 08:48:43 +0000 Subject: [PATCH] Accepting request 820643 from home:xiaoguang_wang:branches:GNOME:Factory - Update gnome-shell-extensions.spec: Replace is_opensuse with sle_version (jsc#SLE-11720). OBS-URL: https://build.opensuse.org/request/show/820643 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=221 --- gnome-shell-extensions.changes | 6 ++++++ gnome-shell-extensions.spec | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index 20f298b..27ec8a7 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 13 02:17:42 UTC 2020 - Xiaoguang Wang + +- Update gnome-shell-extensions.spec: Replace is_opensuse with + sle_version (jsc#SLE-11720). + ------------------------------------------------------------------- Tue May 12 07:16:00 UTC 2020 - Xiaoguang Wang diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 4c97082..8bd3c18 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -125,13 +125,13 @@ translation-update-upstream po %{name} gnome-patch-translation-prepare po %{name} %patch1000 -p1 -%if !0%{?is_opensuse} +%if 0%{?sle_version} %patch1001 -p1 %endif # In openSUSE GNOME, we don't launch gnome-session directly, but wrap this through a shell script, /usr/bin/gnome sed -i "s:Exec=gnome-session:Exec=gnome:g" data/gnome-classic.desktop.in cp %{SOURCE1} . -%if !0%{?is_opensuse} +%if 0%{?sle_version} sed -i -e 's/openSUSE/SUSE Linux Enterprise/g' README.SUSE %endif @@ -155,14 +155,14 @@ tar -xzvf %{SOURCE6} install -d %{buildroot}/%{_datadir}/gnome-shell/extensions/sle-classic@suse.com cp sle-classic@suse.com/* %{buildroot}/%{_datadir}/gnome-shell/extensions/sle-classic@suse.com install -m0644 %{SOURCE7} %{buildroot}/%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.sle-classic.gschema.override -%if !0%{?is_opensuse} +%if 0%{?sle_version} tar -xzvf %{SOURCE3} install -d %{buildroot}%{_datadir}/gnome-shell/theme cp SLE-theme/theme/* %{buildroot}%{_datadir}/gnome-shell/theme %endif %fdupes %{buildroot}%{_datadir} -%if !0%{?is_opensuse} +%if 0%{?sle_version} # Prepare for 'default.desktop' being update-alternative handled, boo#1039756 mkdir -p %{buildroot}%{_sysconfdir}/alternatives touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop @@ -172,7 +172,7 @@ install -d -m755 %{buildroot}%{_datadir}/wayland-sessions ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_datadir}/wayland-sessions/default.desktop %endif -%if !0%{?is_opensuse} +%if 0%{?sle_version} %post -n gnome-shell-classic %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ default-xsession.desktop %{_datadir}/xsessions/sle-classic.desktop 20 @@ -217,7 +217,7 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %{_datadir}/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/sle-classic.css %{_datadir}/gnome-shell/modes/sle-classic.json %{_datadir}/gnome-shell/extensions/sle-classic@suse.com/ -%if !0%{?is_opensuse} +%if 0%{?sle_version} %dir %{_datadir}/wayland-sessions %{_datadir}/gnome-shell/theme/sle-background.png %{_datadir}/xsessions/default.desktop