From 790ff917852c8158a3458ee431347198ac253f86 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 Sep 2009 01:42:23 +0000 Subject: [PATCH] Apply GConf schemas --- NetworkManager.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index e82f6a6..36465c5 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -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 - 0.7.996-3.git20090921 +- Install GConf schemas + * Mon Sep 21 2009 Dan Williams - 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