From 84fbaf4c7c9d630aea789c35e5bdd2309dcced20e84a26e06aaafedba4d0fb89 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 24 Jan 2012 11:21:29 +0000 Subject: [PATCH] Accepting request 100985 from home:vuntz:branches:GNOME:Factory Update to 3.3.4 OBS-URL: https://build.opensuse.org/request/show/100985 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=97 --- gnome-shell-3.3.3.tar.xz | 3 --- gnome-shell-3.3.4.tar.xz | 3 +++ gnome-shell-link-gl.patch | 28 ---------------------------- gnome-shell.changes | 38 ++++++++++++++++++++++++++++++++++++++ gnome-shell.spec | 18 +++++++----------- 5 files changed, 48 insertions(+), 42 deletions(-) delete mode 100644 gnome-shell-3.3.3.tar.xz create mode 100644 gnome-shell-3.3.4.tar.xz delete mode 100644 gnome-shell-link-gl.patch diff --git a/gnome-shell-3.3.3.tar.xz b/gnome-shell-3.3.3.tar.xz deleted file mode 100644 index bd0a73a..0000000 --- a/gnome-shell-3.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70c6ad0b682b72c927329f0f066b29d1b08ade7d92e77fba15832ec1c19be87b -size 1244096 diff --git a/gnome-shell-3.3.4.tar.xz b/gnome-shell-3.3.4.tar.xz new file mode 100644 index 0000000..22e2a25 --- /dev/null +++ b/gnome-shell-3.3.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f11189862ec3c5d3b94a67f4b89ec0a654c9f83f56c91cff485aa013577a0aa +size 1244756 diff --git a/gnome-shell-link-gl.patch b/gnome-shell-link-gl.patch deleted file mode 100644 index 2af2435..0000000 --- a/gnome-shell-link-gl.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 235cb9c505a9c24934dcb4d307edc8facf82da6b Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Sat, 14 Jan 2012 23:58:53 +0000 -Subject: build: Add the 'gl' pkg-config - -Cogl does not explicitly link against GL or GLES any more, and Clutter -master dropped the 'gl' pkg-config requirement because it introduced -unneeded and conflicting dependencies. - -GNOME Shell still uses glXQuery* API, so it needs to explicitly link -against libGL. - -https://bugzilla.gnome.org/show_bug.cgi?id=667864 ---- -diff --git a/configure.ac b/configure.ac -index d0c99dd..b4d5afe 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -84,6 +84,7 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION - gjs-internals-1.0 >= $GJS_MIN_VERSION - libgnome-menu-3.0 $recorder_modules - gdk-x11-3.0 libsoup-2.4 -+ gl - clutter-x11-1.0 >= $CLUTTER_MIN_VERSION - clutter-glx-1.0 >= $CLUTTER_MIN_VERSION - libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION --- -cgit v0.9.0.2 diff --git a/gnome-shell.changes b/gnome-shell.changes index 66c3979..fd5ac33 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Sat Jan 21 09:25:33 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.3.4: + + https://live.gnome.org/EveryDetailMatters + - Add "browse" for labels for dash items: once a tooltip is + showing, switch to other items without a delay [bgo#666170] + - Always scale down windows in the overview at least to 70% + [bgo#646704] + - Fix the new-workspace drop indicator sometimes getting stuck + [bgo#664201] + - Delay rearranging windows in the overview as long as the + pointer is over a window [bgo#645325] + + Add a GConf => DConf migration file for overriden Mutter + settings [bgo#667636] + + When a VPN connection is active, show that as the network icon + [bgo#665115] + + Handle the "ExtendedAway" IM status as away, not offline + [bgo#667813] + + Improve the appearance of the labels in "Applications" + [bgo#642392] + + Adjust for GTK+ and Mutter API changes for application menu + [bgo#668118] + + Add section label support to the application menu [bgo#666681] + + Fix screenshot methods to work again [bgo#667662] + + Fix several crashers related to updating workspace thumbnails + [bgo#667652] + + Fix memory management error causing gnome-shell-hotplug-sniffer + to crash [bgo#667378] + + Build fixes [bgo#667864] + + Code cleanups [bgo#668087] + + Misc bug fixes [bgo#633028, bgo#658817, bgo#664138, bgo#667881, + bgo#668048, bgo#668050] + + Updated translations. +- Drop gnome-shell-link-gl.patch: fixed upstream. +- Remove gnome-common BuildRequires and call to gnome-autogen.sh: + those were only needed for patch above. + ------------------------------------------------------------------- Wed Jan 18 12:08:24 UTC 2012 - vuntz@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index 1650542..f2116ca 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -16,17 +16,13 @@ # Name: gnome-shell -Version: 3.3.3 +Version: 3.3.4 Release: 0 Summary: GNOME Shell License: GPL-2.0+ Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeShell Source: http://download.gnome.org/sources/gnome-shell/3.3/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM gnome-shell-link-gl.patch vuntz@opensuse.org -- Explicitly link to GL, taken from git -Patch0: gnome-shell-link-gl.patch -# needed for patch0 -BuildRequires: gnome-common BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files @@ -37,7 +33,7 @@ BuildRequires: xz BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5 BuildRequires: pkgconfig(folks) >= 0.5.2 BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(gio-2.0) >= 2.31.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.31.6 BuildRequires: pkgconfig(gjs-1.0) >= 1.29.18 BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(gnome-bluetooth-1.0) >= 3.1.0 @@ -46,7 +42,7 @@ BuildRequires: pkgconfig(gnome-keyring-1) 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(gtk+-3.0) >= 3.3.9 BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.2 BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libcroco-0.6) @@ -60,7 +56,7 @@ BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.11 BuildRequires: pkgconfig(mutter-plugins) BuildRequires: pkgconfig(polkit-agent-1) >= 0.100 -BuildRequires: pkgconfig(telepathy-glib) >= 0.15.5 +BuildRequires: pkgconfig(telepathy-glib) >= 0.15.6 BuildRequires: pkgconfig(telepathy-logger-0.2) >= 0.2.4 BuildRequires: pkgconfig(xfixes) Requires: gdk-pixbuf-loader-rsvg @@ -125,11 +121,8 @@ to enable, disable and install them. %prep %setup -q translation-update-upstream -%patch0 -p1 %build -# needed for patch0 -NOCONFIGURE=1 gnome-autogen.sh export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins %configure \ --disable-static \ @@ -167,6 +160,9 @@ rm -rf %{buildroot} %if "%{_libdir}" != "%{_libexecdir}" %{_libdir}/gnome-shell/ %endif +%dir %{_datadir}/GConf +%dir %{_datadir}/GConf/gsettings +%{_datadir}/GConf/gsettings/gnome-shell-overrides.convert %{_datadir}/applications/gnome-shell.desktop %{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service %{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service