rpms/NetworkManager/devel NetworkManager.spec,1.286,1.287

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16307

Modified Files:
	NetworkManager.spec 
Log Message:
Apply GConf schemas



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -p -r1.286 -r1.287
--- NetworkManager.spec	21 Sep 2009 21:24:31 -0000	1.286
+++ NetworkManager.spec	24 Sep 2009 01:42:23 -0000	1.287
@@ -16,7 +16,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.996
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -236,11 +236,25 @@ 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`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+fi
+
+%preun gnome
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+fi
+
 %post gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
 
 %postun gnome
 touch --no-create %{_datadir}/icons/hicolor
@@ -250,7 +264,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
-%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO 
+%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
 %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
 %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
 %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
@@ -328,6 +342,9 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 0.7.996-3.git20090921
+- Install GConf schemas
+
 * Mon Sep 21 2009 Dan Williams <dcbw at redhat.com> - 0.7.996-2.git20090921
 - nm: allow disconnection of all device types
 - nm: ensure that wired connections are torn down when their hardware goes away