From 681176869479e1f164f3dfef2bf7dd8aaa8b4d9537dc28414fa602ce700f46e0 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 27 Jul 2011 22:05:16 +0000
Subject: [PATCH] Accepting request 77191 from
 home:vuntz:branches:GNOME:Factory

Update to 0.9.0

OBS-URL: https://build.opensuse.org/request/show/77191
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/dconf?expand=0&rev=28
---
 dconf-0.7.5.tar.bz2 |  3 ---
 dconf-0.9.0.tar.bz2 |  3 +++
 dconf.changes       | 26 ++++++++++++++++++++++++++
 dconf.spec          | 11 ++++++-----
 4 files changed, 35 insertions(+), 8 deletions(-)
 delete mode 100644 dconf-0.7.5.tar.bz2
 create mode 100644 dconf-0.9.0.tar.bz2

diff --git a/dconf-0.7.5.tar.bz2 b/dconf-0.7.5.tar.bz2
deleted file mode 100644
index cc9f598..0000000
--- a/dconf-0.7.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2103e8207744903790e9fac6427fa394bb485a0c7f4e0d03b0fb43268c34f33
-size 193355
diff --git a/dconf-0.9.0.tar.bz2 b/dconf-0.9.0.tar.bz2
new file mode 100644
index 0000000..bf27286
--- /dev/null
+++ b/dconf-0.9.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:267fc4e09edc6be79aed7945bd6d9bfce69fea050789336be9b12753c726baf8
+size 201428
diff --git a/dconf.changes b/dconf.changes
index 4edea09..190c13f 100644
--- a/dconf.changes
+++ b/dconf.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed Jul 27 12:24:44 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 0.9.0:
+  + Support loading/storing of maybe types in dconf
+  + Remove NFS detection hackery and rely on XDG runtime dir
+  + Add proper support for change notification to DConfClient
+  + Commandline tool improvements:
+    - reset: reset keys or entire subpaths
+    - dump: dump entire subpaths to keyfile format
+    - load: load them back again (maybe at a different path)
+    - watch: actually works now
+  + Editor improvements:
+    - keys now change in editor when changed from outside
+    - support for flags
+    - show dconf-editor in applications list
+  + Work around incompatible Vala bindings changes with an #if
+  + Don't install the bash completion script as executable
+  + Fix a warning caused by reusing a GError variable
+  + Other small fixes
+- Remove SUSE_ASNEEDED=0: this is not needed anymore.
+- Add SystemSetup category to dconf-editor.desktop to make the brp
+  checks happy.
+- Comment out Icon line with sed in dconf-editor.desktop, until we
+  get an icon in the tarball. Else, the build fails in brp checks.
+
 -------------------------------------------------------------------
 Tue May 17 16:53:08 CEST 2011 - dimstar@opensuse.org
 
diff --git a/dconf.spec b/dconf.spec
index 224b56f..a87d756 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -18,14 +18,14 @@
 
 
 Name:           dconf
-Version:        0.7.5
+Version:        0.9.0
 Release:        1
-# FIXME: remove SUSE_ASNEEDED=0 when this is fixed: https://bugzilla.gnome.org/show_bug.cgi?id=626280
+# FIXME: remove sed hack to remove icon from desktop file when there's an icon in the tarball
 License:        LGPLv2.1+
 Summary:        Simple key-based configuration system
 Group:          System/Libraries
 Url:            http://live.gnome.org/dconf
-Source:         %{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/dconf/0.9/%{name}-%{version}.tar.bz2
 Source99:       baselibs.conf
 # For directory ownership
 BuildRequires:  dbus-1
@@ -135,7 +135,6 @@ have configuration storage systems.
 %endif
 
 %build
-export SUSE_ASNEEDED=0
 %configure \
 %if 0%{?BUILD_FROM_VCS}
     --enable-gtk-doc
@@ -146,7 +145,9 @@ export SUSE_ASNEEDED=0
 %install
 %makeinstall
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
-%suse_update_desktop_file %{buildroot}%{_datadir}/applications/dconf-editor.desktop
+%suse_update_desktop_file %{buildroot}%{_datadir}/applications/dconf-editor.desktop SystemSetup
+# FIXME: temporary hack to make the build not fail while we have no icon
+sed -i "s/^Icon=dconf-editor/#Icon=dconf-editor/" %{buildroot}%{_datadir}/applications/dconf-editor.desktop
 mkdir -p %{buildroot}%{_sysconfdir}/dconf/{profile,db}
 
 %post -n libdconf0 -p /sbin/ldconfig