Accepting request 634763 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/634763
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=184

00_org.gnome.shell.extensions.sle-classic.gschema.override

@@ -0,0 +1,12 @@
+[org.gnome.mutter:sle-Classic]
+dynamic-workspaces=false
+
+[org.gnome.desktop.wm.preferences:sle-Classic]
+button-layout='appmenu:minimize,maximize,close'
+
+[org.gnome.desktop.wm.keybindings:sle-Classic]
+switch-applications=[]
+switch-windows=['<Super>Tab','<Alt>Tab']
+
+[org.gnome.settings-daemon.plugins.xsettings:sle-Classic]
+overrides={'Gtk/ShellShowsAppMenu': <0>}

_service

@@ -1,14 +0,0 @@
-<services>
-  <service mode="disabled" name="tar_scm">
-    <param name="url">https://gitlab.gnome.org/GNOME/gnome-shell-extensions.git</param>
-    <param name="scm">git</param>
-    <param name="revision">gnome-3-28</param>
-    <param name="versionformat">3.28.1+%cd.%h</param>
-    <param name="changesgenerate">enable</param>
-  </service>
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service mode="disabled" name="set_version" />
-</services>

_servicedata

@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">https://gitlab.gnome.org/GNOME/gnome-shell-extensions.git</param>
-              <param name="changesrevision">6746061898376ff39dd8034c22469d1ce4aadf9d</param></service></servicedata>

gnome-shell-extensions-3.28.1+20180413.6746061.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:edb6a0235dc02792a06e9c320c06278dd9af4490e735d4031cf5d1c560da2257
-size 198540

gnome-shell-extensions-3.30.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0538ca528ceaa2f5c6e9ff7e356654fe712b305ec0ae6575934830ce0ecadb54
+size 198640

gnome-shell-extensions.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Sep  6 08:23:44 UTC 2018 - xwang@suse.com
+
+- Update sle-classic to adapte version 3.30.0
+  + Add 00_org.gnome.shell.extensions.sle-classic.gschema.override
+  + Update gse-sle-classic-ext.patch
+  + Update sle-classic-xorg.desktop
+  + Update sle-classic.desktop
+  + Update sle-classic@suse.com.tar.gz
+
+-------------------------------------------------------------------
+Thu Sep  6 03:38:52 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 3.30.0:
+  + No visible changes.
+- Changes frome version 3.29.91:
+  + Misc. bug fixes: glgo#GNOME/gnome-shell-extensions#90.
+
+-------------------------------------------------------------------
+Fri Aug  3 20:49:10 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.29.90:
+  + Misc. bug fixes: bgo#786496.
+
 -------------------------------------------------------------------
 Fri Aug  3 06:05:03 UTC 2018 - qkzhu@suse.com
 
@@ -20,6 +44,13 @@ Tue Jul 17 07:00:04 UTC 2018 - xwang@suse.com
   is disabled, can't show clone window in overview mode
   (bsc#1095325).
 
+-------------------------------------------------------------------
+Fri Jun 22 02:24:25 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 3.29.2:
+  + Misc. bug fix: glgo#GNOME/gnome-shell-extensions#69.
+- Drop source-service use: the situation has been normalized.
+
 -------------------------------------------------------------------
 Mon Jun  4 03:11:44 UTC 2018 - xwang@suse.com
 

gnome-shell-extensions.spec

@@ -18,30 +18,34 @@
 
 
 %global __requires_exclude typelib\\(Meta\\)
+
 Name:           gnome-shell-extensions
-Version:        3.28.1+20180413.6746061
+Version:        3.30.0
 Release:        0
 Summary:        A collection of extensions for GNOME Shell
 License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
-Url:            https://wiki.gnome.org/Projects/GnomeShell/Extensions
+URL:            https://wiki.gnome.org/Projects/GnomeShell/Extensions
-#Source0:       https://download.gnome.org/sources/gnome-shell-extensions/3.28/%%{name}-%%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/gnome-shell-extensions/3.30/%{name}-%{version}.tar.xz
-Source:         %{name}-%{version}.tar.xz
 Source1:        README.SUSE
 Source2:        sle-classic.desktop
 Source3:        SLE-theme.tar.gz
 Source4:        sle-classic-xorg.desktop
 Source5:        sle-classic.json
 Source6:        sle-classic@suse.com.tar.gz
+Source7:        00_org.gnome.shell.extensions.sle-classic.gschema.override
+
 # 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-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
 # 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
@@ -101,10 +105,10 @@ and also installs the required session files.
 %patch2 -p1
 translation-update-upstream po %{name}
 gnome-patch-translation-prepare po %{name}
-%if !0%{?is_opensuse}
-%patch3 -p1
-%endif
 %patch1000 -p1
+%if !0%{?is_opensuse}
+%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} .
@@ -122,17 +126,16 @@ sed -i -e 's/openSUSE/SUSE Linux Enterprise/g' README.SUSE
 %install
 %meson_install
 %find_lang %{name} %{?no_lang_C}
+#Install SLE theme
+#Install sle-classic@suse.com extension
 install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/xsessions/sle-classic.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
-#Install sle-classic@suse.com extension
 tar -xzvf %{SOURCE6}
-install -d %{buildroot}%{_datadir}/gnome-shell/extensions/sle-classic@suse.com
+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
+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}
 install -m0644 %{SOURCE4} %{buildroot}/%{_datadir}/xsessions/sle-classic-xorg.desktop
 tar -xzvf %{SOURCE3}
@@ -147,6 +150,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
 ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
 touch %{buildroot}%{_sysconfdir}/alternatives/default-waylandsession.desktop
+install -d -m755 %{buildroot}%{_datadir}/wayland-sessions
 ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_datadir}/wayland-sessions/default.desktop
 %endif
 
@@ -154,14 +158,10 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
 %post -n gnome-shell-classic
 %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
   default-xsession.desktop %{_datadir}/xsessions/sle-classic.desktop 20
-%{_sbindir}/update-alternatives --install %{_datadir}/wayland-sessions/default.desktop \
-  default-waylandsession.desktop %{_datadir}/wayland-sessions/sle-classic.desktop 20
 
 %postun -n gnome-shell-classic
 [ -f %{_datadir}/xsessions/sle-classic.desktop ] || %{_sbindir}/update-alternatives \
   --remove default-xsession.desktop %{_datadir}/xsessions/sle-classic.desktop
-[ -f %{_datadir}/wayland-sessions/sle-classic.desktop ] || %{_sbindir}/update-alternatives \
-  --remove default-waylandsession.desktop %{_datadir}/wayland-sessions/sle-classic.desktop
 %endif
 
 %files common
@@ -170,12 +170,13 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
 
 %files -n gnome-shell-classic
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.classic-overrides.gschema.xml
+%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.classic.gschema.override
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.example.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.window-list.gschema.xml
+%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.sle-classic.gschema.override
 %{_datadir}/gnome-session/sessions/gnome-classic.session
 %dir %{_datadir}/gnome-shell/extensions
 %{_datadir}/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gcampax.github.com/
@@ -200,9 +201,8 @@ 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/
-%dir %{_datadir}/wayland-sessions
-%{_datadir}/wayland-sessions/sle-classic.desktop
 %if !0%{?is_opensuse}
+%dir %{_datadir}/wayland-sessions
 %{_datadir}/gnome-shell/theme/sle-background.png
 %{_datadir}/xsessions/default.desktop
 %{_datadir}/xsessions/sle-classic-xorg.desktop

gse-sle-classic-ext.patch

@@ -1,7 +1,7 @@
-Index: gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/classic.css
+Index: gnome-shell-extensions-3.29.90/extensions/window-list/classic.css
 ===================================================================
---- gnome-shell-extensions-3.28.1+20180413.6746061.orig/extensions/window-list/classic.css
+--- gnome-shell-extensions-3.29.90.orig/extensions/window-list/classic.css
-+++ gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/classic.css
++++ gnome-shell-extensions-3.29.90/extensions/window-list/classic.css
 @@ -6,7 +6,7 @@
      height: 2.25em ;
    }
@@ -43,11 +43,11 @@ Index: gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/cla
      color: #888;
      box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
    }
-Index: gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/extension.js
+Index: gnome-shell-extensions-3.29.90/extensions/window-list/extension.js
 ===================================================================
---- gnome-shell-extensions-3.28.1+20180413.6746061.orig/extensions/window-list/extension.js
+--- gnome-shell-extensions-3.29.90.orig/extensions/window-list/extension.js
-+++ gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/extension.js
++++ gnome-shell-extensions-3.29.90/extensions/window-list/extension.js
-@@ -27,6 +27,395 @@ const GroupingMode = {
+@@ -27,6 +27,398 @@ const GroupingMode = {
      ALWAYS: 2
  };
  
@@ -98,10 +98,12 @@ Index: gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/ext
 +        this._grouped = undefined;
 +        // NOTE: do NOT `_checkGrouping` here
 +
++        let workspaceManager = global.workspace_manager;
++
 +        // workspace related
 +        this._workspaceSignals = new Map();
 +        this._nWorkspacesChangedId =
-+            global.screen.connect('notify::n-workspaces',
++            workspaceManager.connect('notify::n-workspaces',
 +                                     this._onWorkspacesChanged.bind(this));
 +        this._onWorkspacesChanged();
 +
@@ -335,9 +337,10 @@ Index: gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/ext
 +    }
 +
 +    _onWorkspacesChanged() {
-+        let numWorkspaces = global.screen.n_workspaces;
++        let workspaceManager = global.workspace_manager;
++        let numWorkspaces = workspaceManager.n_workspaces;
 +        for (let i = 0; i < numWorkspaces; i++) {
-+            let workspace = global.screen.get_workspace_by_index(i);
++            let workspace = workspaceManager.get_workspace_by_index(i);
 +            if (this._workspaceSignals.has(workspace))
 +                continue;
 +
@@ -443,7 +446,7 @@ Index: gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/ext
  
  function _minimizeOrActivateWindow(window) {
          let focusWindow = global.display.focus_window;
-@@ -1258,5 +1647,10 @@ class Extension {
+@@ -1257,5 +1649,10 @@ class Extension {
  };
  
  function init() {
@@ -455,10 +458,10 @@ Index: gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/ext
 +        return new Extension();
 +    }
  }
-Index: gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/stylesheet.css
+Index: gnome-shell-extensions-3.29.90/extensions/window-list/stylesheet.css
 ===================================================================
---- gnome-shell-extensions-3.28.1+20180413.6746061.orig/extensions/window-list/stylesheet.css
+--- gnome-shell-extensions-3.29.90.orig/extensions/window-list/stylesheet.css
-+++ gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/stylesheet.css
++++ gnome-shell-extensions-3.29.90/extensions/window-list/stylesheet.css
 @@ -79,6 +79,10 @@
    border: 1px solid #cccccc;
  }
@@ -470,10 +473,10 @@ Index: gnome-shell-extensions-3.28.1+20180413.6746061/extensions/window-list/sty
  .notification {
    font-weight: normal;
  }
-Index: gnome-shell-extensions-3.28.1+20180413.6746061/data/gnome-classic.scss
+Index: gnome-shell-extensions-3.29.90/data/gnome-classic.scss
 ===================================================================
---- gnome-shell-extensions-3.28.1+20180413.6746061.orig/data/gnome-classic.scss
+--- gnome-shell-extensions-3.29.90.orig/data/gnome-classic.scss
-+++ gnome-shell-extensions-3.28.1+20180413.6746061/data/gnome-classic.scss
++++ gnome-shell-extensions-3.29.90/data/gnome-classic.scss
 @@ -103,3 +103,15 @@ $variant: 'light';
      &:hover, &focus { background-color: darken($bg_color,2%); }
    }

sle-classic-xorg.desktop

@@ -139,4 +139,4 @@ Exec=env GNOME_SHELL_SESSION_MODE=sle-classic gnome-session --session gnome-clas
 TryExec=gnome-session
 Icon=
 Type=Application
-DesktopNames=sle-classic;GNOME
+DesktopNames=sle-Classic;GNOME

sle-classic.desktop

@@ -139,4 +139,4 @@ Exec=env GNOME_SHELL_SESSION_MODE=sle-classic gnome-session --session gnome-clas
 TryExec=gnome-session
 Icon=
 Type=Application
-DesktopNames=sle-classic;GNOME
+DesktopNames=sle-Classic;GNOME

sle-classic@suse.com.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2906079ca7773b2876cfe333a8dcb87d191f73826ebd857a08d689e1693ebd86
+oid sha256:fc36d2a43f64bf66296efd72b38e8fc0244935eba260f156265e5c8bdefe68fc
-size 6246
+size 6130