rpms/gnome-utils/FC-6 gnome-utils.spec,1.131,1.132

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-utils/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv26595

Modified Files:
	gnome-utils.spec 
Log Message:
fix scripts



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-utils/FC-6/gnome-utils.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gnome-utils.spec	4 Sep 2006 19:22:30 -0000	1.131
+++ gnome-utils.spec	18 Oct 2006 17:32:38 -0000	1.132
@@ -10,7 +10,7 @@
 
 Name:           gnome-utils
 Version:        2.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -42,9 +42,9 @@
 
 Requires(post): scrollkeeper
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version} 
-Requires(post): GConf2
-
-Requires(preun): GConf2
+Requires(post): GConf2 >= 2.14
+Requires(preun): GConf2 >= 2.14
+Requires(pre): GConf2 >= 2.14
 
 Requires(postun): scrollkeeper
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} 
@@ -136,22 +136,40 @@
 scrollkeeper-update -q
 update-desktop-database -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-export SCHEMAS="gnome-dictionary.schemas logview.schemas gnome-search-tool.schemas gnome-screenshot.schemas baobab.schemas" 
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null 
-done
+gconftool-2 --makefile-install-rule \
+	%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas \
+	%{_sysconfdir}/gconf/schemas/logview.schemas \
+	%{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas \
+	%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas \
+	%{_sysconfdir}/gconf/schemas/baobab.schemas \
+		> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+	%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas \
+	%{_sysconfdir}/gconf/schemas/logview.schemas \
+	%{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas \
+	%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas \
+	%{_sysconfdir}/gconf/schemas/baobab.schemas \
+		> /dev/null || :
+fi
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    export SCHEMAS="gnome-dictionary.schemas logview.schemas gnome-search-tool.schemas gnome-screenshot.schemas baobab.schemas" 
-    for S in $SCHEMAS; do
-      gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null 
-    done
+    gconftool-2 --makefile-uninstall-rule \
+	%{_sysconfdir}/gconf/schemas/gnome-dictionary.schemas \
+	%{_sysconfdir}/gconf/schemas/logview.schemas \
+	%{_sysconfdir}/gconf/schemas/gnome-search-tool.schemas \
+	%{_sysconfdir}/gconf/schemas/gnome-screenshot.schemas \
+	%{_sysconfdir}/gconf/schemas/baobab.schemas \
+		> /dev/null || :
 fi
 
 %postun
@@ -228,6 +246,9 @@
 
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-2
+- Fix scripts according to the packaging guidelines
+
 * Mon Sep  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-1.fc6
 - Update to 2.16.0