fix scripts

1 files changed, 33 insertions, 9 deletions

diff --git a/gnome-applets.spec b/gnome-applets.spec
index 55b6b71..a43a3ce 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -22,7 +22,7 @@
 %define pygobject_version 2.6
 %define pygtk_version 2.6
 %define gnome_python_version 2.10
-%define gconf_version 2.14
+%define gconf_version 2.14.0
 
 %define po_package gnome-applets-2.0
 
@@ -118,6 +118,10 @@ Requires:	gnome-panel >= %{gnome_panel_version}
 Requires:	libxklavier >= %{libxklavier_version}
 Requires:	gstreamer-plugins-base >= %{gstreamer_plugins_version}
 Requires:	gstreamer-plugins-good >= %{gstreamer_plugins_version}
+Requires(post): GConf2 >= %{gconf_version}
+Requires(pre): GConf2 >= %{gconf_version}
+Requires(preun): GConf2 >= %{gconf_version}
+Requires(post): scrollkeeper
 
 # For wireless-applet backwards compat
 Requires:       gnome-netstatus >= 2.8.0-2
@@ -137,10 +141,6 @@ Obsoletes:      gnome-cpufreq-applet
 # since we are installing .pc files
 Requires: pkgconfig
 
-Requires(post): GConf2 >= %{gconf_version}
-Requires(preun): GConf2 >= %{gconf_version}
-Requires(post): scrollkeeper
-
 %description
 GNOME (GNU Network Object Model Environment) is a user-friendly set of
 applications and desktop tools to be used in conjunction with a window
@@ -245,7 +245,28 @@ gconftool-2 --makefile-install-rule                                        \
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
 %endif
 	    %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
-%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null
+%{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule                                    \
+	    %{_sysconfdir}/gconf/schemas/battstat.schemas                  \
+	    %{_sysconfdir}/gconf/schemas/charpick.schemas                  \
+	    %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas            \
+	    %{_sysconfdir}/gconf/schemas/drivemount.schemas                \
+	    %{_sysconfdir}/gconf/schemas/geyes.schemas                     \
+	    %{_sysconfdir}/gconf/schemas/gswitchit.schemas                 \
+	    %{_sysconfdir}/gconf/schemas/gweather.schemas                  \
+	    %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas     \
+	    %{_sysconfdir}/gconf/schemas/mini-commander.schemas            \
+	    %{_sysconfdir}/gconf/schemas/mixer.schemas                     \
+	    %{_sysconfdir}/gconf/schemas/modemlights.schemas               \
+%if %{build_stickynotes}
+	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
+%endif
+	    %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null || :
+fi
 
 %preun
 if [ "$1" -eq 0 ]; then
@@ -265,7 +286,7 @@ if [ "$1" -eq 0 ]; then
 %if %{build_stickynotes}
 	    %{_sysconfdir}/gconf/schemas/stickynotes.schemas               \
 %endif
-	    %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null
+	    %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null || :
 fi
 
 %postun 
@@ -332,10 +353,13 @@ fi
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
-* Tue Oct 17 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.0.1-10
+* Wed Oct 18 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.0.1-10
+- Fix scripts according to packaging guidelines
+
+* Tue Oct 17 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.0.1-9
 - Fix up requirements (#202549)
 
-* Sat Oct 14 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.0.1-9
+* Sat Oct 14 2006 Matthias Clasen <mclasen@redhat.com> - 1:2.16.0.1-8
 - Fix muting in the mixer applet (#208660)
 
 * Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 1:2.16.0.1-7