[network-manager-applet] Move GSettings schema XML to nm-connection-editor rpm to really fix rh #852792

[Jirka Klimes]

commit cd07d4c9fc0bca9ded09bf066cd42788eb123afb
Author: Jiří Klimeš <jklimes at redhat.com>
Date:   Wed Sep 12 11:43:43 2012 +0200

    Move GSettings schema XML to nm-connection-editor rpm to really fix rh #852792
    
    It's no problem because network-manager-applet depends on nm-connection-editor.

 network-manager-applet.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/network-manager-applet.spec b/network-manager-applet.spec
index 070fe8a..f392ad1 100644
--- a/network-manager-applet.spec
+++ b/network-manager-applet.spec
@@ -11,7 +11,7 @@
 Name: network-manager-applet
 Summary: A network control and status applet for NetworkManager
 Version: 0.9.7.0
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 Group: Applications/System
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -137,31 +137,31 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 
 %post -n nm-connection-editor
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 %postun -n nm-connection-editor
 if [ $1 -eq 0 ] ; then
     touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 %posttrans -n nm-connection-editor
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 %files
 %defattr(-,root,root,0755)
@@ -183,7 +183,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/22x22/apps/nm-vpn-active-lock.png
 %{_datadir}/icons/hicolor/22x22/apps/nm-vpn-connecting*.png
 %{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png
-%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
 %{_datadir}/GConf/gsettings/nm-applet.convert
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 
@@ -201,6 +200,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/*/apps/nm-device-*.*
 %{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
 %{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
+%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
 %dir %{_datadir}/gnome-vpn-properties
 %ifnarch s390 s390x
 %{_libdir}/gnome-bluetooth/plugins/*
@@ -220,6 +220,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libnm-gtk.so
 
 %changelog
+* Wed Sep 12 2012 Jiří Klimeš <jklimes at redhat.com> - 0.9.7.0-3.git20120820
+- move GSettings schema XML to nm-connection-editor rpm (rh #852792)
+
 * Thu Aug 30 2012 Jiří Klimeš <jklimes at redhat.com> - 0.9.7.0-2.git20120820
 - run glib-compile-schemas in %post scriplet (rh #852792)