From a67d8c28ef26bac7e6972ee595e6717468dbcd9b2281f983e8f9e83696bd8cf1 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Tue, 15 Nov 2011 09:38:41 +0000
Subject: [PATCH] Accepting request 91376 from home:dimstar:GNOME:Next

resubmit

OBS-URL: https://build.opensuse.org/request/show/91376
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=129
---
 gnome-desktop-3.2.1.tar.bz2                |  3 ---
 gnome-desktop-3.3.1.tar.bz2                |  3 +++
 gnome-desktop-gnome-wall-clock-crash.patch | 27 ----------------------
 gnome-desktop.changes                      | 17 ++++++++++++++
 gnome-desktop.spec                         |  4 ++--
 5 files changed, 22 insertions(+), 32 deletions(-)
 delete mode 100644 gnome-desktop-3.2.1.tar.bz2
 create mode 100644 gnome-desktop-3.3.1.tar.bz2
 delete mode 100644 gnome-desktop-gnome-wall-clock-crash.patch

diff --git a/gnome-desktop-3.2.1.tar.bz2 b/gnome-desktop-3.2.1.tar.bz2
deleted file mode 100644
index 86ef340..0000000
--- a/gnome-desktop-3.2.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:099bf28484555efcf0e08397d92584dea4a57a7b1dee826cab4ad928426dd84e
-size 1283627
diff --git a/gnome-desktop-3.3.1.tar.bz2 b/gnome-desktop-3.3.1.tar.bz2
new file mode 100644
index 0000000..e655e3a
--- /dev/null
+++ b/gnome-desktop-3.3.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:304fe6d680460cff949280b8f1dff1a4a092b45fc6dd5ecf157a93bc6435d26c
+size 1284356
diff --git a/gnome-desktop-gnome-wall-clock-crash.patch b/gnome-desktop-gnome-wall-clock-crash.patch
deleted file mode 100644
index fd8843c..0000000
--- a/gnome-desktop-gnome-wall-clock-crash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit a65613bf0a507a226c172bb6f503e27532efb0fa
-Author: Vincent Untz <vuntz@gnome.org>
-Date:   Thu Sep 8 19:01:35 2011 +0200
-
-    GnomeWallClock: Remove the date/time source on dispose
-    
-    We don't do it in finalize since the dispose handler needs the objects
-    that are being disposed.
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=658583
-
-diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnome-wall-clock.c
-index 49437d8..167619d 100644
---- a/libgnome-desktop/gnome-wall-clock.c
-+++ b/libgnome-desktop/gnome-wall-clock.c
-@@ -84,6 +84,11 @@ gnome_wall_clock_dispose (GObject *object)
- {
- 	GnomeWallClock *self = GNOME_WALL_CLOCK (object);
- 
-+	if (self->priv->clock_update_id) {
-+		g_source_remove (self->priv->clock_update_id);
-+		self->priv->clock_update_id = 0;
-+	}
-+
- 	if (self->priv->tz_monitor != NULL) {
- 		g_object_unref (self->priv->tz_monitor);
- 		self->priv->tz_monitor = NULL;
diff --git a/gnome-desktop.changes b/gnome-desktop.changes
index 3f350dd..271cb82 100644
--- a/gnome-desktop.changes
+++ b/gnome-desktop.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Oct 26 20:16:21 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 3.3.1:
+  + GnomePnpIds: Add object to get the vendor name from PNP IDs
+  + GnomeRR:
+    - Fix crash in update_brightness_limits
+    - Don't print an error for no backlight
+    - Remove deprecated functions
+    - When setting the DPMS mode manually, clear the timeouts
+    - Ignore DPMSSetTimeouts() and DPMSForceLevel() return value
+    - Other DPMS-related fixes
+  + GnomeWallClock:
+    - Remove the date/time source on dispose
+    - Fix non-Linux fallback code
+- Really drop gnome-desktop-gnome-wall-clock-crash.patch.
+
 -------------------------------------------------------------------
 Sun Oct 16 17:15:50 UTC 2011 - vuntz@opensuse.org
 
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index a3ff32f..1c29630 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -19,13 +19,13 @@
 %define IS_DEFAULT_GNOME_DESKTOP 1
 
 Name:           gnome-desktop
-Version:        3.2.1
+Version:        3.3.1
 Release:        1
 License:        LGPLv2.1+
 Summary:        The GNOME Desktop API Library
 Url:            http://www.gnome.org
 Group:          System/GUI/GNOME
-Source:         http://download.gnome.org/sources/gnome-desktop/3.2/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gnome-desktop/3.3/%{name}-%{version}.tar.bz2
 Source99:       baselibs.conf
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel