Accepting request 82271 from home:vuntz:branches:GNOME:Factory

Update to 3.1.91.1

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

gnome-shell-3.1.91.1.tar.bz2

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

gnome-shell-3.1.91.tar.bz2

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

gnome-shell-fix-service.patch

@@ -0,0 +1,23 @@
+commit 80a79c88bc32a01034680eb6f4afd6730edd635a
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Thu Sep 15 13:43:01 2011 +0200
+
+    build: Fix rule to create .service files
+    
+    It was always taking the first .service.in file to create all .service
+    files: org.gnome.Shell.CalendarServer.service.in was the only one being
+    used.
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 11449ea..d19f0fe 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -19,7 +19,7 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ servicedir = $(datadir)/dbus-1/services
+ service_DATA = $(service_in_files:.service.in=.service)
+ 
+-$(service_DATA): $(service_in_files) Makefile
++%.service: %.service.in Makefile
+ 	$(AM_V_GEN)									\
+ 		[ -d $(@D) ] || $(mkdir_p) $(@D) ;					\
+ 		sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@.tmp && mv $@.tmp $@

gnome-shell-plugin-dir.patch

@@ -0,0 +1,37 @@
+commit b8d136b2142cd26b8249bbb73c580f5abdc41b8f
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Thu Sep 15 07:42:43 2011 +0200
+
+    browser-plugin: Add support for BROWSER_PLUGIN_DIR environment variable
+    
+    This makes it easy to override where the plugin should be installed.
+    
+    This is based on what totem does.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=659123
+
+diff --git a/browser-plugin/Makefile.am b/browser-plugin/Makefile.am
+index 4bfb350..0dc7da1 100644
+--- a/browser-plugin/Makefile.am
++++ b/browser-plugin/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-mozillalibdir = $(libdir)/mozilla/plugins
++mozillalibdir = $(BROWSER_PLUGIN_DIR)
+ 
+ mozillalib_LTLIBRARIES = libgnome-shell-browser-plugin.la
+ 
+diff --git a/configure.ac b/configure.ac
+index a7493c9..93dd0a0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -235,6 +235,9 @@ else
+ fi
+ AC_SUBST(SHELL_SYSTEM_CA_FILE,["$with_ca_certificates"])
+ 
++BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
++AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
++
+ AC_CONFIG_FILES([
+   Makefile
+   data/Makefile

gnome-shell.changes

@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Thu Sep 15 05:09:01 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 3.1.91.1:
+  + Add a browser plugin: this plugin, tied to extensions.gnome.org,
+    allows users to download and install shell extensions, and
+    enable, disable, and uninstall extensions they already have
+    installed. [bgo#658070, bgo#658612]
+  + Improve adding links to URLs in notifications [bgo#636252]
+  + Remove "connection lost" notifications after reconnecting
+    [bgo#658049]
+  + Hide the onscreen keyboard when leaving a text entry
+    [bgo#658591]
+  + Fixes for translated strings [bgo#639987, bgo#644097,
+    bgo#645037]
+  + Bug fixes for network menu [bgo#658492]
+  + Code cleanup [bgo#646934]
+  + Build fixes
+  + Misc bug fixes [bgo#652837, bgo#658423, bgo#658503, bgo#658525,
+    bgo#658562, bgo#658624, bgo#658640, bgo#658983]
+  + Updated translations.
+- Add pkgconfig(json-glib-1.0): new dependency.
+- Add --with-ca-certificates=%{_sysconfdir}/ssl/ca-bundle.pem to
+  configure, so that gnome-shell knows where to find the
+  certificates.
+- Add gnome-shell-fix-service.patch: fix build of a dbus .service
+  file so that it's created from the correct file (instead of
+  duplicating another .service file).
+- Fix browser plugin installation:
+  + Add gnome-shell-plugin-dir.patch: let us easily specify where
+    the browser plugin should get installed.
+  + Add gnome-common BuildRequires and call to gnome-autogen.sh,
+    needed for above patch.
+  + Export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins to install
+    the browser plugin in the right directory.
+- Create a gnome-shell-browser-plugin subpackage for this new
+  browser plugin. Add a Recommends for it to gnome-shell, since it
+  makes sense to have it by default.
+
 -------------------------------------------------------------------
 Wed Sep  7 08:41:51 UTC 2011 - vuntz@opensuse.org
 

gnome-shell.spec

@@ -18,13 +18,19 @@
 
 
 Name:           gnome-shell
-Version:        3.1.91
+Version:        3.1.91.1
 Release:        1
 License:        GPLv2+
 Summary:        GNOME Shell
 Group:          System/GUI/GNOME
 Url:            http://live.gnome.org/GnomeShell
 Source:         http://download.gnome.org/sources/gnome-shell/3.1/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM gnome-shell-plugin-dir.patch bgo#659123 vuntz@opensuse.org -- Specify where the browser plugin should get installed
+Patch0:         gnome-shell-plugin-dir.patch
+# PATCH-FIX-UPSTREAM gnome-shell-fix-service.patch vuntz@opensuse.org -- Correctly build .service files
+Patch1:         gnome-shell-fix-service.patch
+# needed for patch0 & patch1
+BuildRequires:  gnome-common
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
@@ -44,6 +50,7 @@ BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 0.10.1
 BuildRequires:  pkgconfig(gstreamer-0.10) >= 0.10.16
 BuildRequires:  pkgconfig(gstreamer-base-0.10)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.0.0
+BuildRequires:  pkgconfig(json-glib-1.0) >= 0.13.2
 BuildRequires:  pkgconfig(libcanberra)
 BuildRequires:  pkgconfig(libcroco-0.6)
 BuildRequires:  pkgconfig(libedataserver-1.2) >= 1.2.0
@@ -79,6 +86,7 @@ Requires:       gnome-themes-accessibility
 Requires:       gnome-screensaver
 # network system icon
 Requires:       NetworkManager-gnome
+Recommends:     %{name}-browser-plugin
 Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
@@ -89,17 +97,37 @@ The GNOME Shell redefines user interactions with the GNOME desktop. In
 particular, it offers new paradigms for launching applications, accessing
 documents, and organizing open windows in GNOME.
 
+%package browser-plugin
+License:        GPLv2+
+Summary:        GNOME Shell Browser Plugin for the Extensions Repository
+Group:          System/GUI/GNOME
+Requires:       %{name} = %{version}
+Supplements:    packageand(%{name}:MozillaFirefox)
+
+%description browser-plugin
+The GNOME Shell Browser Plugin provides integration with gnome-shell
+and the corresponding extensions repository. The plugin allows the
+extensions repository to provide good integration, letting the website
+know which extensions are enabled and disabled, and allowing the website
+to enable, disable and install them.
+
 %lang_package
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
+%patch1 -p1
 
 %build
+# needed for patch0 & patch1
+NOCONFIGURE=1 gnome-autogen.sh
+export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins
 %configure \
         --disable-static \
         --libexecdir=%{_libexecdir}/%{name} \
         --disable-schemas-install \
-        --enable-compile-warnings=no
+        --enable-compile-warnings=no \
+        --with-ca-certificates=%{_sysconfdir}/ssl/ca-bundle.pem
 %__make %{?_smp_mflags} V=1
 
 %install
@@ -130,7 +158,7 @@ rm -rf %{buildroot}
 
 %files -f %{name}.schemas_list
 %defattr(-,root,root)
-%doc COPYING
+%doc COPYING README NEWS
 %{_bindir}/gnome-shell
 %{_bindir}/gnome-shell-extension-tool
 %{_libexecdir}/gnome-shell/
@@ -145,6 +173,11 @@ rm -rf %{buildroot}
 %dir %{_datadir}/gnome-shell/extensions
 %doc %{_mandir}/man?/gnome-shell.*
 
+%files browser-plugin
+%defattr(-,root,root)
+%doc browser-plugin/README
+%{_libdir}/browser-plugins/libgnome-shell-browser-plugin.*
+
 %files lang -f %{name}.lang
 
 %changelog