From 58a3b7dfc41ecc863e09ee88b01c46bbd8d6b5dcab279b274ef70e7504f3b4be Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 10 Nov 2017 14:47:02 +0000 Subject: [PATCH] Accepting request 540129 from home:xiaoguang_wang:branches:GNOME:Factory - Apply SLE-Classic session on Tumbleweed (bsc#1051772). + Rename sle-classic-favorites-menu-at-end.patch to gnome-shell-favorites-menu-at-end.patch OBS-URL: https://build.opensuse.org/request/show/540129 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=154 --- gnome-shell-extensions.changes | 7 ++++ gnome-shell-extensions.spec | 32 +++++++++---------- ...=> gnome-shell-favorites-menu-at-end.patch | 0 3 files changed, 22 insertions(+), 17 deletions(-) rename sle-classic-favorites-menu-at-end.patch => gnome-shell-favorites-menu-at-end.patch (100%) diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index 39a539b..4a45969 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 9 01:37:47 UTC 2017 - xwang@suse.com + +- Apply SLE-Classic session on Tumbleweed (bsc#1051772). + + Rename sle-classic-favorites-menu-at-end.patch to + gnome-shell-favorites-menu-at-end.patch + ------------------------------------------------------------------- Mon Nov 6 01:20:01 UTC 2017 - xwang@suse.com diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 759e805..fa66098 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -34,8 +34,8 @@ Source5: sle-classic.json Source6: sle-classic@suse.com.tar.gz # PATCH-FEATURE-OPENSUSE gnome-shell-add-app-to-desktop.patch bnc#870580 dliang@suse.com -- allow adding app shortcut to desktop easily. Patch1: gnome-shell-add-app-to-desktop.patch -# PATCH-FEATURE-SLE sle-classic-favorites-menu-at-end.patch bnc#890989 cxiong@suse.com -- put the favorites at the end of the app catogories for accessibility reason -- cxiong@suse.com bnc#890989 -Patch2: sle-classic-favorites-menu-at-end.patch +# PATCH-FEATURE-OPENSUSE sle-classic-favorites-menu-at-end.patch bnc#890989 cxiong@suse.com -- put the favorites at the end of the app catogories for accessibility reason -- cxiong@suse.com bnc#890989 +Patch2: gnome-shell-favorites-menu-at-end.patch # PATCH-FEATURE-SLE sle-classic-lock-screen-background.patch bsc#1007468 xwang@suse.com -- add SUSE logo on lock screen when auth is requested Patch3: sle-classic-lock-screen-background.patch ## NOTE keep SLE Classic patch at the bottom @@ -99,13 +99,13 @@ and also installs the required session files. %prep %setup -q %patch1 -p1 +%patch2 -p1 %if !0%{?is_opensuse} translation-update-upstream gnome-patch-translation-prepare -%patch2 -p1 %patch3 -p1 -%patch1000 -p1 %endif +%patch1000 -p1 ##gnome-patch-translation-update # 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 @@ -116,9 +116,7 @@ sed -i -e 's/openSUSE/SUSE Linux Enterprise/g' README.SUSE %build CLASSIC_EXTENSIONS=$(awk -F\" '/^CLASSIC_EXTENSIONS=/{ print $2 }' configure.ac) -%if !0%{?is_opensuse} CLASSIC_EXTENSIONS="${CLASSIC_EXTENSIONS} workspace-indicator" -%endif %configure \ --enable-classic-mode \ --enable-extensions="$CLASSIC_EXTENSIONS" @@ -127,23 +125,25 @@ make %{?_smp_mflags} %install %make_install %find_lang %{name} %{?no_lang_C} -%if !0%{?is_opensuse} install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/xsessions/sle-classic.desktop -install -m0644 %{SOURCE4} %{buildroot}/%{_datadir}/xsessions/sle-classic-xorg.desktop cp %{buildroot}/%{_datadir}/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/classic.css \ %{buildroot}/%{_datadir}/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/sle-classic.css install -m0644 %{SOURCE5} %{buildroot}/%{_datadir}/gnome-shell/modes/sle-classic.json install -d -m755 %{buildroot}%{_datadir}/wayland-sessions install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/wayland-sessions/sle-classic.desktop # Install SLE theme -tar -xzvf %{SOURCE3} -install -d %{buildroot}%{_datadir}/gnome-shell/theme -cp SLE-theme/theme/* %{buildroot}%{_datadir}/gnome-shell/theme #Install sle-classic@suse.com extension 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 +%if !0%{?is_opensuse} +install -m0644 %{SOURCE4} %{buildroot}/%{_datadir}/xsessions/sle-classic-xorg.desktop +tar -xzvf %{SOURCE3} +install -d %{buildroot}%{_datadir}/gnome-shell/theme +cp SLE-theme/theme/* %{buildroot}%{_datadir}/gnome-shell/theme +%endif +%if !0%{?is_opensuse} # Prepare for 'default.desktop' being update-alternative handled, boo#1039756 mkdir -p %{buildroot}%{_sysconfdir}/alternatives touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop @@ -180,9 +180,7 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %{_datadir}/gnome-shell/extensions/apps-menu@gnome-shell-extensions.gcampax.github.com/ %{_datadir}/gnome-shell/extensions/launch-new-instance@gnome-shell-extensions.gcampax.github.com/ %{_datadir}/gnome-shell/extensions/places-menu@gnome-shell-extensions.gcampax.github.com/ -%if !0%{?is_opensuse} %{_datadir}/gnome-shell/extensions/workspace-indicator@gnome-shell-extensions.gcampax.github.com/ -%endif %{_datadir}/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/ %dir %{_datadir}/gnome-shell/modes %{_datadir}/gnome-shell/modes/classic.json @@ -196,17 +194,17 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %{_datadir}/gnome-shell/theme/gnome-classic.css %{_datadir}/gnome-shell/theme/gnome-classic-high-contrast.css %{_datadir}/xsessions/gnome-classic.desktop -%if !0%{?is_opensuse} -%{_datadir}/xsessions/default.desktop %{_datadir}/xsessions/sle-classic.desktop -%{_datadir}/xsessions/sle-classic-xorg.desktop %{_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/ %dir %{_datadir}/wayland-sessions -%{_datadir}/wayland-sessions/default.desktop %{_datadir}/wayland-sessions/sle-classic.desktop +%if !0%{?is_opensuse} %{_datadir}/gnome-shell/theme/sle-background.png +%{_datadir}/xsessions/default.desktop +%{_datadir}/xsessions/sle-classic-xorg.desktop +%{_datadir}/wayland-sessions/default.desktop %ghost %{_sysconfdir}/alternatives/default-xsession.desktop %ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop %endif diff --git a/sle-classic-favorites-menu-at-end.patch b/gnome-shell-favorites-menu-at-end.patch similarity index 100% rename from sle-classic-favorites-menu-at-end.patch rename to gnome-shell-favorites-menu-at-end.patch