Accepting request 156493 from GNOME:Factory

Update to 3.6.3.1 - GNOME Stable branch. No real change to what we have, just aligning version numbers with upstream. Should go to 12.3

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

g-s-fix-notification-expansion.patch

@@ -1,66 +0,0 @@
-From 9d931b5e013475be5733fc92bd105b3a691a4097 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Fri, 30 Nov 2012 15:05:38 +0000
-Subject: MessageTray: fix notification height expansion
-
-MessageTray._tween removes all tweens now, so it removes also
-those setting the height to expanded for critical notifications.
-
-This is a regression from 1a27d7dfc02c06bd0ccf4258a9108207b8832ce4
-
-https://bugzilla.gnome.org/show_bug.cgi?id=689295
----
-diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
-index ce61e25..ef0cc02 100644
---- a/js/ui/messageTray.js
-+++ b/js/ui/messageTray.js
-@@ -2200,40 +2200,28 @@ const MessageTray = new Lang.Class({
-     _updateShowingNotification: function() {
-         this._notification.acknowledged = true;
- 
--        Tweener.removeTweens(this._notificationWidget);
--
-         // We auto-expand notifications with CRITICAL urgency.
--        // We use Tweener.removeTweens() to remove a tween that was hiding the notification we are
--        // updating, in case that notification was in the process of being hidden. However,
--        // Tweener.removeTweens() would also remove a tween that was updating the position of the
--        // notification we are updating, in case that notification was already expanded and its height
--        // changed. Therefore we need to call this._expandNotification() for expanded notifications
--        // to make sure their position is updated.
--        if (this._notification.urgency == Urgency.CRITICAL || this._notification.expanded)
-+        if (this._notification.urgency == Urgency.CRITICAL)
-             this._expandNotification(true);
- 
-         // We tween all notifications to full opacity. This ensures that both new notifications and
-         // notifications that might have been in the process of hiding get full opacity.
-         //
--        // We tween any notification showing in the banner mode to banner height
--        // (this._notificationWidget.y = -this._notificationWidget.height).
-+        // We tween any notification showing in the banner mode to the appropriate height
-+        // (which is banner height or expanded height, depending on the notification state)
-         // This ensures that both new notifications and notifications in the banner mode that might
--        // have been in the process of hiding are shown with the banner height.
-+        // have been in the process of hiding are shown with the correct height.
-         //
-         // We use this._showNotificationCompleted() onComplete callback to extend the time the updated
-         // notification is being shown.
--        //
--        // We don't set the y parameter for the tween for expanded notifications because
--        // this._expandNotification() will result in getting this._notificationWidget.y set to the appropriate
--        // fully expanded value.
-+
-         let tweenParams = { opacity: 255,
-+                            y: -this._notificationWidget.height,
-                             time: ANIMATION_TIME,
-                             transition: 'easeOutQuad',
-                             onComplete: this._showNotificationCompleted,
-                             onCompleteScope: this
-                           };
--        if (!this._notification.expanded)
--            tweenParams.y = -this._notificationWidget.height;
- 
-         this._tween(this._notificationWidget, '_notificationState', State.SHOWN, tweenParams);
-    },
---
-cgit v0.9.0.2
-

gnome-shell-3.6.3.1.tar.xz

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

gnome-shell-3.6.3.tar.xz

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

gnome-shell.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Feb 22 21:58:09 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 3.6.3.1:
+  + Fix regression in reentrancy fix for 3.6.3 (bgo#689295).
+  + Updated translations.
+- Drop g-s-fix-notification-expansion.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Thu Feb 14 02:25:31 UTC 2013 - badshah400@gmail.com
 

gnome-shell.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gnome-shell
-Version:        3.6.3
+Version:        3.6.3.1
 Release:        0
 Summary:        GNOME Shell
 License:        GPL-2.0+
@@ -28,10 +28,8 @@ Source:         http://download.gnome.org/sources/gnome-shell/3.6/%{name}-%{vers
 Patch1:         gnome-shell-private-connection.patch
 # PATCH-FIX-UPSTREAM gnome-shell-nmlibexecdir.patch bgo#693590 dimstar@opensuse.org -- Allow NetworkManager installation to use different libexecdir than gnome-shell
 Patch2:         gnome-shell-nmlibexecdir.patch
-# PATCH-FIX-UPSTREAM g-s-fix-notification-expansion.patch bgo#689295 badshah400@gmail.com -- Fix notification not expanding into tray, a regression due to earlier commits; patch taken from upstream git
-Patch3:         g-s-fix-notification-expansion.patch
 BuildRequires:  docbook-xsl-stylesheets
-# Needed for patch4
+# Needed for patch2
 BuildRequires:  gnome-common
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
@@ -137,11 +135,10 @@ to enable, disable and install them.
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 translation-update-upstream
 
 %build
-# Needed for patch4
+# Needed for patch2
 NOCONFIGURE=1 gnome-autogen.sh
 export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins
 %configure \