diff --git a/SLE-theme.tar.gz b/SLE-theme.tar.gz deleted file mode 100644 index 62d4ac4..0000000 --- a/SLE-theme.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd782cf048ce05c3dda637207625754e4795f87da7e6cef804a974849134d027 -size 13419 diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index 4291c1c..0f974d4 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 10 02:08:23 UTC 2020 - Xiaoguang Wang + +- Move branding image file to branding-SLE package + (jsc#SLE-11720 bsc#1176304). + + Remove sle-classic-lock-screen-background.patch + + Remove SLE-theme.tar.gz + ------------------------------------------------------------------- Thu Aug 13 21:48:09 UTC 2020 - Bjørn Lie diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 19e2364..cfe89f1 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -28,7 +28,6 @@ URL: https://wiki.gnome.org/Projects/GnomeShell/Extensions Source0: https://download.gnome.org/sources/gnome-shell-extensions/3.36/%{name}-%{version}.tar.xz Source1: README.SUSE Source2: sle-classic.desktop -Source3: SLE-theme.tar.gz Source5: sle-classic.json Source6: sle-classic@suse.com.tar.gz Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override @@ -42,8 +41,6 @@ Patch3: gnome-classic-s390-not-require-g-s-d_wacom.patch ## NOTE keep SLE Classic patch at the bottom # PATCH-FIX-SLE gse-sle-classic-ext.patch Fate#318572 cxiong@suse.com -- add sle classic support Patch1000: gse-sle-classic-ext.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 -Patch1001: sle-classic-lock-screen-background.patch BuildRequires: fdupes BuildRequires: gnome-patch-translation # Needed for directory ownership @@ -125,9 +122,6 @@ translation-update-upstream po %{name} gnome-patch-translation-prepare po %{name} %patch1000 -p1 -%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} . @@ -155,11 +149,6 @@ 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%{?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%{?sle_version} @@ -219,7 +208,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %{_datadir}/gnome-shell/extensions/sle-classic@suse.com/ %if 0%{?sle_version} %dir %{_datadir}/wayland-sessions -%{_datadir}/gnome-shell/theme/sle-background.png %{_datadir}/xsessions/default.desktop %{_datadir}/wayland-sessions/default.desktop %ghost %{_sysconfdir}/alternatives/default-xsession.desktop diff --git a/sle-classic-lock-screen-background.patch b/sle-classic-lock-screen-background.patch deleted file mode 100644 index 17cee5e..0000000 --- a/sle-classic-lock-screen-background.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: gnome-shell-extensions-3.33.91/data/gnome-shell-sass/_common.scss -=================================================================== ---- gnome-shell-extensions-3.33.91.orig/data/gnome-shell-sass/_common.scss -+++ gnome-shell-extensions-3.33.91/data/gnome-shell-sass/_common.scss -@@ -1916,6 +1916,7 @@ StScrollBar { - //reset - border: none; - background-color: transparent; -+ background: #2e3436 url(sle-background.png); - - $_gdm_fg: #f6f5f4; - $_gdm_bg: lighten(#2e3436, 19%);