[NetworkManager/f16] Fix build for GSettings usage, requite dbus-glib >= 0.94

[Jirka Klimes]

commit fb61fae13014f8ee2752b8eb8ebd2b1085884b6f
Author: Jiří Klimeš <jklimes at redhat.com>
Date:   Thu Jul 26 12:53:12 2012 +0200

    Fix build for GSettings usage, requite dbus-glib >= 0.94

 NetworkManager.spec |   35 ++++++++++++-----------------------
 1 files changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 8dbc197..3105f3f 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -1,5 +1,5 @@
 %define dbus_version 1.1
-%define dbus_glib_version 0.86-4
+%define dbus_glib_version 0.94
 
 %define gtk3_version	3.0.1
 %define glib2_version	2.24.0
@@ -15,7 +15,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.9.5.96
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -325,37 +325,20 @@ exit 0
 %post	glib -p /sbin/ldconfig
 %postun	glib -p /sbin/ldconfig
 
-%pre gnome
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
-  fi
-fi
-
-%preun gnome
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
-    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
-  fi
-fi
-
 %post gnome
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
-fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 
 %postun gnome
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 fi
 
 %posttrans gnome
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
@@ -411,6 +394,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,0755)
 %{_bindir}/nm-applet
 %{_bindir}/nm-connection-editor
+%{_libexecdir}/nm-applet-migration-tool
 %{_datadir}/applications/*.desktop
 %{_datadir}/nm-applet/
 %{_datadir}/icons/hicolor/16x16/apps/*.png
@@ -418,9 +402,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/32x32/apps/*.png
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
+%{_datadir}/GConf/gsettings/nm-applet.convert
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %dir %{_datadir}/gnome-vpn-properties
-%{_sysconfdir}/gconf/schemas/nm-applet.schemas
 %ifnarch s390 s390x
 %{_libdir}/gnome-bluetooth/plugins/*
 %endif
@@ -468,6 +453,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libnm-gtk.so
 
 %changelog
+* Thu Jul 26 2012 Jiří Klimeš <jklimes at redhat.com> - 0.9.5.96-2.git20120725
+- fix the build due to GConf -> GSettings transition
+- require dbus-glib 0.94
+
 * Wed Jul 25 2012 Dan Williams <dcbw at redhat.com> - 0.9.5.96-1.git20120725
 - Update to 0.9.6-rc2
 - core: fix race between parallel DHCP client invocations