Accepting request 75972 from GNOME:Factory

Tweak

OBS-URL: https://build.opensuse.org/request/show/75972
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell-extensions?expand=0&rev=5

gnome-shell-extensions-3.0.2.tar.bz2

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

gnome-shell-extensions-3.1.3.tar.bz2

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

gnome-shell-extensions-fix-zero-length-warning-for-stylesheets.patch

@@ -0,0 +1,27 @@
+From b6cc2d6df43d8187d58cac78b3679d6100ee6416 Mon Sep 17 00:00:00 2001
+From: malcolmlewis <malcolmlewis@opensuse.org>
+Date: Fri, 8 Jul 2011 15:24:50 -0500
+Subject: [PATCH] Fix zero-length warning for stylesheets
+
+
+Signed-off-by: malcolmlewis <malcolmlewis@opensuse.org>
+---
+ extensions/gajim/stylesheet.css      |    1 +
+ extensions/user-theme/stylesheet.css |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/extensions/gajim/stylesheet.css b/extensions/gajim/stylesheet.css
+index e69de29..6d91483 100644
+--- a/extensions/gajim/stylesheet.css
++++ b/extensions/gajim/stylesheet.css
+@@ -0,0 +1 @@
++/* none used */
+diff --git a/extensions/user-theme/stylesheet.css b/extensions/user-theme/stylesheet.css
+index e69de29..6d91483 100644
+--- a/extensions/user-theme/stylesheet.css
++++ b/extensions/user-theme/stylesheet.css
+@@ -0,0 +1 @@
++/* none used */
+-- 
+1.7.3.4
+

gnome-shell-extensions.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Fri Jul  8 20:45:41 UTC 2011 - malcolmlewis@opensuse.org
+
+- Update to version 3.1.3:
+  + New extensions added:
+    - drive-menu: A menu for removable drives.
+    - apps-menu: A GNOME 2 like menu for apps.
+    - places-menu: A GNOME 2 like menu for places.
+    - native-window-placement: Additional configurability for the
+      window layout in the overview, including a mechanism similar
+      to KDE4.
+    - systemMonitor: A message tray indicator for CPU and memory
+      usage (uses libgtop).
+  + user-theme: Fixed resetting theme and support themes installed
+    in /usr/share/themes.
+  + alternative-status-menu: ported to gnome-shell master.
+  + dock: ported to gnome-shell master, make position configurable
+    (can be left or right).
+  + Updated translations.
+- Disable systemMonitor for now, with a %build_systemMonitor
+  macro. It requires libgtop >= 2.28.4 which is not available.
+- Add schema requirements to dock extension.
+- Change License field from GPLv2+ to GPL-2.0+ to conform with
+  spdx.org identifier.
+- Dropped %build_drive_menu macro as it is now part of the 3.1.x
+  tarball.
+- Add gnome-shell-extensions-fix-zero-length-warning-for-
+  stylesheets.patch, reported upstream as bgo#654274.
+
 -------------------------------------------------------------------
 Tue May 24 11:36:07 CEST 2011 - dimstar@opensuse.org
 

gnome-shell-extensions.spec

@@ -16,19 +16,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
+# libgtop-2.0 >= 2.28.4 is required for systemMonitor
-# Drive Menu does not exist in the 3.0.x tree. It's supposedly comming with 3.1.x
+%define build_systemMonitor 0
-%define build_drive_menu 0
 
 Name:           gnome-shell-extensions
-Version:        3.0.2
+Version:        3.1.3
 Release:        1
-License:        GPLv2+
+License:        GPL-2.0+
 Summary:        A collection of extensions for GNOME Shell
 Url:            http://live.gnome.org/GnomeShell/Extensions
 Group:          System/GUI/GNOME
-Source:         %{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gnome-shell-extensions/3.1/%{name}-%{version}.tar.bz2
 Source1:        README.SUSE
+# PATCH-FIX-UPSTREAM gnome-shell-extensions-fix-zero-length-warning-for-stylesheets.patch bgo#654274 malcolmlewis@opensuse.org -- Fix zero-length warning for stylesheets
+Patch0:          gnome-shell-extensions-fix-zero-length-warning-for-stylesheets.patch
 # Needed because we build from a git checkout
 BuildRequires:  gnome-common
 # Needed for directory ownership
@@ -37,12 +38,16 @@ BuildRequires:  pkgconfig(gnome-desktop-3.0)
 Requires:       gnome-shell
 Recommends:     gnome-shell-extension-alt-status-menu
 Recommends:     gnome-shell-extension-alternate-tab
+Recommends:     gnome-shell-extension-apps-menu
 Recommends:     gnome-shell-extension-auto-move-windows
 Recommends:     gnome-shell-extension-dock
-%if 0%{?build_drive_menu}
 Recommends:     gnome-shell-extension-drive-menu
-%endif
 Recommends:     gnome-shell-extension-gajim
+Recommends:     gnome-shell-extension-native-window-placement
+Recommends:     gnome-shell-extension-places-menu
+%if 0%{?build_systemMonitor}
+Recommends:     gnome-shell-extension-systemMonitor
+%endif
 Recommends:     gnome-shell-extension-user-theme
 Recommends:     gnome-shell-extension-windows-navigator
 Recommends:     gnome-shell-extension-xrandr-indicator
@@ -56,7 +61,7 @@ additional and optional functionality to GNOME Shell.
 %package -n gnome-shell-extension-alt-status-menu
 Summary:        GNOME Shell Extension -- Power Off Item in Status Menu
 Group:          System/GUI/GNOME
-License:        GPLv2+
+License:        GPL-2.0+
 Requires:       gnome-shell
 Recommends:     %{name}-lang
 
@@ -67,7 +72,7 @@ menu, and provides the ability to hibernate.
 %package -n gnome-shell-extension-alternate-tab
 Summary:        GNOME Shell Extension -- Classic Alt+Tab behavior
 Group:          System/GUI/GNOME
-License:        GPLv2+
+License:        GPL-2.0+
 Requires:       gnome-shell
 Recommends:     %{name}-lang
 
@@ -75,10 +80,20 @@ Recommends:     %{name}-lang
 This GNOME Shell extension changes Alt+Tab to be window-based
 instead of app-based.
 
+%package -n gnome-shell-extension-apps-menu
+Summary:        GNOME Shell Extension -- Applications Menu
+Group:          System/GUI/GNOME
+License:        GPL-2.0+
+Requires:       gnome-shell
+Recommends:     %{name}-lang
+
+%description -n gnome-shell-extension-apps-menu
+This GNOME Shell extension adds a gnome 2.x style menu for applications.
+
 %package -n gnome-shell-extension-auto-move-windows
 Summary:        GNOME Shell Extension -- Assign specific workspaces to applications
 Group:          System/GUI/GNOME
-License:        GPLv2+
+License:        GPL-2.0+
 Requires:       gnome-shell
 Recommends:     %{name}-lang
 %glib2_gsettings_schema_requires
@@ -91,9 +106,10 @@ it creates a window, in a manner configurable with a GSettings key.
 %package -n gnome-shell-extension-dock
 Summary:        GNOME Shell Extension -- Dock-style Task Switcher
 Group:          System/GUI/GNOME
-License:        GPLv2+
+License:        GPL-2.0+
 Requires:       gnome-shell
 Recommends:     %{name}-lang
+%glib2_gsettings_schema_requires
 
 %description -n gnome-shell-extension-dock
 This GNOME Shell extension displays a dock-style task switcher on
@@ -102,7 +118,7 @@ the right side of the screen.
 %package -n gnome-shell-extension-drive-menu
 Summary:        GNOME Shell Extension -- Drive status menu
 Group:          System/GUI/GNOME
-License:        GPLv2+
+License:        GPL-2.0+
 Requires:       gnome-shell
 Recommends:     %{name}-lang
 
@@ -113,7 +129,7 @@ and unmounting removable devices.
 %package -n gnome-shell-extension-gajim
 Summary:        GNOME Shell Extension -- Gajim Integration
 Group:          System/GUI/GNOME
-License:        GPLv2+
+License:        GPL-2.0+
 Requires:       gnome-shell
 Recommends:     %{name}-lang
 
@@ -121,10 +137,45 @@ Recommends:     %{name}-lang
 This GNOME Shell extension adds integration with the Gajim instant
 messaging client.
 
+%package -n gnome-shell-extension-native-window-placement
+Summary:        GNOME Shell Extension -- Native Window Placement
+Group:          System/GUI/GNOME
+License:        GPL-2.0+
+Requires:       gnome-shell
+Recommends:     %{name}-lang
+%glib2_gsettings_schema_requires
+
+%description -n gnome-shell-extension-native-window-placement
+This GNOME Shell extension provides additional configurability for the
+window layout in the overview, including a mechanism similar to KDE4.
+
+%package -n gnome-shell-extension-places-menu
+Summary:        GNOME Shell Extension -- Places Status Indicator
+Group:          System/GUI/GNOME
+License:        GPL-2.0+
+Requires:       gnome-shell
+Recommends:     %{name}-lang
+
+%description -n gnome-shell-extension-places-menu
+This GNOME Shell extension add a systems status menu for quickly
+navigating places in the system.
+
+%package -n gnome-shell-extension-systemMonitor
+Summary:        GNOME Shell Extension -- 
+Group:          System/GUI/GNOME
+License:        GPL-2.0+
+Requires:       gnome-shell
+Requires:       libgtop >= 2.28.4
+Recommends:     %{name}-lang
+
+%description -n gnome-shell-extension-systemMonitor
+This GNOME Shell extension is amessage tray indicator for CPU and memory
+usage (uses libgtop). 
+
 %package -n gnome-shell-extension-user-theme
 Summary:        GNOME Shell Extension -- Support for Custom Themes
 Group:          System/GUI/GNOME
-License:        GPLv2+
+License:        GPL-2.0+
 Requires:       gnome-shell
 Recommends:     %{name}-lang
 %glib2_gsettings_schema_requires
@@ -136,7 +187,7 @@ This GNOME Shell extension enables loading a GNOME Shell theme from
 %package -n gnome-shell-extension-windows-navigator
 Summary:        GNOME Shell Extension -- Keyboard Selection of Windows and Workspaces
 Group:          System/GUI/GNOME
-License:        GPLv2+
+License:        GPL-2.0+
 Requires:       gnome-shell
 Recommends:     %{name}-lang
 
@@ -147,7 +198,7 @@ and workspaces in overlay mode, by pressing the alt key.
 %package -n gnome-shell-extension-xrandr-indicator
 Summary:        GNOME Shell Extension -- Status Menu for Rotating Monitors
 Group:          System/GUI/GNOME
-License:        GPLv2+
+License:        GPL-2.0+
 Requires:       gnome-shell
 Recommends:     %{name}-lang
 
@@ -158,6 +209,7 @@ laptop monitor and open display preferences quickly.
 %lang_package
 %prep
 %setup -q
+%patch0 -p1
 cp %{S:1} .
 
 %build
@@ -181,6 +233,18 @@ rm -r %{buildroot}%{_datadir}/gnome-shell/extensions/example@gnome-shell-extensi
 %postun -n gnome-shell-extension-auto-move-windows
 %glib2_gsettings_schema_postun
 
+%post -n gnome-shell-extension-dock
+%glib2_gsettings_schema_post
+
+%postun -n gnome-shell-extension-dock
+%glib2_gsettings_schema_postun
+
+%post -n gnome-shell-extension-native-window-placement
+%glib2_gsettings_schema_post
+
+%postun -n gnome-shell-extension-native-window-placement
+%glib2_gsettings_schema_postun
+
 %post -n gnome-shell-extension-user-theme
 %glib2_gsettings_schema_post
 
@@ -201,6 +265,10 @@ rm -r %{buildroot}%{_datadir}/gnome-shell/extensions/example@gnome-shell-extensi
 %doc COPYING
 %{_datadir}/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gnome.org/
 
+%files -n gnome-shell-extension-apps-menu
+%defattr(-,root,root)
+%{_datadir}/gnome-shell/extensions/apps-menu@gnome-shell-extensions.gnome.org/
+
 %files -n gnome-shell-extension-auto-move-windows
 %defattr(-,root,root)
 %doc COPYING
@@ -210,21 +278,37 @@ rm -r %{buildroot}%{_datadir}/gnome-shell/extensions/example@gnome-shell-extensi
 %files -n gnome-shell-extension-dock
 %defattr(-,root,root)
 %doc COPYING
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.dock.gschema.xml
 %{_datadir}/gnome-shell/extensions/dock@gnome-shell-extensions.gnome.org/
 
-%if 0%{?build_drive_menu}
-
 %files -n gnome-shell-extension-drive-menu
 %defattr(-,root,root)
 %doc COPYING
 %{_datadir}/gnome-shell/extensions/drive-menu@gnome-shell-extensions.gnome.org/
-%endif
 
 %files -n gnome-shell-extension-gajim
 %defattr(-,root,root)
 %doc COPYING
 %{_datadir}/gnome-shell/extensions/gajim@gnome-shell-extensions.gnome.org/
 
+%files -n gnome-shell-extension-native-window-placement
+%defattr(-,root,root)
+%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml
+%{_datadir}/gnome-shell/extensions/native-window-placement@gnome-shell-extensions.gnome.org/
+
+%files -n gnome-shell-extension-places-menu
+%defattr(-,root,root)
+%{_datadir}/gnome-shell/extensions/places-menu@gnome-shell-extensions.gnome.org/
+
+%if 0%{?build_systemMonitor}
+
+%files -n gnome-shell-extension-systemMonitor
+%defattr(-,root,root)
+%doc COPYING
+%{_datadir}/gnome-shell/extensions/systemMonitor@gnome-shell-extensions.gnome.org/
+
+%endif
+
 %files -n gnome-shell-extension-user-theme
 %defattr(-,root,root)
 %doc COPYING