From 936ef5874e613fc612a5cd2576641ee3a4fc89a8092d214e4a5debb87872d882 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 14 Jun 2011 17:59:49 +0000
Subject: [PATCH] Accepting request 73604 from
 home:vuntz:branches:GNOME:Factory

Update to 3.1.2

OBS-URL: https://build.opensuse.org/request/show/73604
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=113
---
 baselibs.conf               |  2 +-
 gnome-desktop-3.1.1.tar.bz2 |  3 ---
 gnome-desktop-3.1.2.tar.bz2 |  3 +++
 gnome-desktop.changes       | 14 ++++++++++++++
 gnome-desktop.spec          | 14 +++++++-------
 5 files changed, 25 insertions(+), 11 deletions(-)
 delete mode 100644 gnome-desktop-3.1.1.tar.bz2
 create mode 100644 gnome-desktop-3.1.2.tar.bz2

diff --git a/baselibs.conf b/baselibs.conf
index 4f76fce..220f302 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,3 +1,3 @@
-libgnome-desktop-3-0
+libgnome-desktop-3-2
   obsoletes "gnome-desktop-<targettype> <= <version>"
   provides "gnome-desktop-<targettype> = <version>"
diff --git a/gnome-desktop-3.1.1.tar.bz2 b/gnome-desktop-3.1.1.tar.bz2
deleted file mode 100644
index dd6f6eb..0000000
--- a/gnome-desktop-3.1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b371f12f5f9b237a27e24ba5e3d1bca3ea9a00f1ad70be0b3af12200aceb703
-size 1247439
diff --git a/gnome-desktop-3.1.2.tar.bz2 b/gnome-desktop-3.1.2.tar.bz2
new file mode 100644
index 0000000..3273ba4
--- /dev/null
+++ b/gnome-desktop-3.1.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:257fbcddf38f7e7a4c98bbd448a2ee25bdde3e113b0ffb3e9bf6f93ff0d37c33
+size 1267408
diff --git a/gnome-desktop.changes b/gnome-desktop.changes
index 532c9b8..aebb9c2 100644
--- a/gnome-desktop.changes
+++ b/gnome-desktop.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jun 14 15:55:50 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 3.1.2:
+  + libgnome-desktop:
+    - GnomeDesktopThumbnail: Use GOnce for thread safety
+    - GnomeRR: Add a size return value to
+      gnome_rr_output_get_edid_data()
+    - GnomeRR: Emit ::output-connected and ::output-disconnected
+      when screen outputs come and go
+  + Updated translations.
+- Rename libgnome-desktop-3-0 to libgnome-desktop-3-2, following
+  library soversion change (also in baselibs.conf).
+
 -------------------------------------------------------------------
 Tue May 17 18:28:23 CEST 2011 - dimstar@opensuse.org
 
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 35d6f7d..4e8c047 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -19,7 +19,7 @@
 %define IS_DEFAULT_GNOME_DESKTOP 1
 
 Name:           gnome-desktop
-Version:        3.1.1
+Version:        3.1.2
 Release:        1
 License:        LGPLv2.1+
 Summary:        The GNOME Desktop API Library
@@ -62,7 +62,7 @@ Obsoletes:      gnome-about < %{version}
 This package contains information on the version of GNOME that is installed.
 %endif
 
-%package -n libgnome-desktop-3-0
+%package -n libgnome-desktop-3-2
 License:        LGPLv2.1+
 Summary:        The GNOME Desktop API Library
 Group:          System/GUI/GNOME
@@ -73,7 +73,7 @@ Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
 %endif
 
-%description -n libgnome-desktop-3-0
+%description -n libgnome-desktop-3-2
 The libgnome-desktop library provides API shared by several applications
 on the desktop, but that cannot live in the platform for various
 reasons. There is no API or ABI guarantee, although we are doing our
@@ -84,7 +84,7 @@ gtk-doc.
 License:        LGPLv2.1+
 Summary:        The GNOME Desktop API Library -- Development Files
 Group:          Development/Libraries/GNOME
-Requires:       libgnome-desktop-3-0 = %{version}
+Requires:       libgnome-desktop-3-2 = %{version}
 %if %IS_DEFAULT_GNOME_DESKTOP
 Provides:       %{name}-devel = %{version}
 Obsoletes:      %{name}-devel < %{version}
@@ -149,11 +149,11 @@ rm %{buildroot}%{_datadir}/gnome/gnome-version.xml
 %clean
 rm -rf %{buildroot}
 
-%post -n libgnome-desktop-3-0 -p /sbin/ldconfig
+%post -n libgnome-desktop-3-2 -p /sbin/ldconfig
 
-%postun -n libgnome-desktop-3-0 -p /sbin/ldconfig
+%postun -n libgnome-desktop-3-2 -p /sbin/ldconfig
 
-%files -n libgnome-desktop-3-0
+%files -n libgnome-desktop-3-2
 %defattr(-, root, root)
 %doc AUTHORS COPYING.LIB NEWS README
 %if %IS_DEFAULT_GNOME_DESKTOP