rpms/yelp/devel yelp.spec,1.78,1.79

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/yelp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25031

Modified Files:
	yelp.spec 
Log Message:
fix scripts



Index: yelp.spec
===================================================================
RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- yelp.spec	12 Oct 2006 17:41:59 -0000	1.78
+++ yelp.spec	18 Oct 2006 17:51:44 -0000	1.79
@@ -19,7 +19,7 @@
 Summary: A system documentation reader from the Gnome project
 Name: yelp
 Version: 2.16.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source: %{name}-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=319096
 Patch1: yelp-2.15.5-fedora-docs.patch
@@ -39,6 +39,7 @@
 Requires: libgcrypt
 Requires: gnome-doc-utils 
 Requires: scrollkeeper
+Requires(pre): GConf2
 Requires(post): GConf2
 Requires(post): desktop-file-utils
 Requires(preun): GConf2
@@ -107,7 +108,7 @@
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null || :
 update-desktop-database &> /dev/null ||:
 
 # update icon themes
@@ -116,9 +117,17 @@
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%pre
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null || :
+fi
+
 %preun
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas > /dev/null || :
+fi
 
 %postun
 update-desktop-database &> /dev/null ||:
@@ -132,6 +141,9 @@
 %{_datadir}/yelp
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-5
+- Fix scripts according to the packaging guidelines
+
 * Thu Oct 12 2006 Christopher Aillon <caillon at redhat.com> - 2.16.0-4.fc6
 - Update requires to the virtual gecko version instead of a specific app