rpms/metacity/FC-6 metacity.spec,1.100,1.101

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Oct 18 14:01:30 UTC 2006


Author: mclasen

Update of /cvs/dist/rpms/metacity/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv28471

Modified Files:
	metacity.spec 
Log Message:
fix scripts



Index: metacity.spec
===================================================================
RCS file: /cvs/dist/rpms/metacity/FC-6/metacity.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- metacity.spec	18 Oct 2006 02:16:18 -0000	1.100
+++ metacity.spec	18 Oct 2006 14:01:28 -0000	1.101
@@ -7,7 +7,7 @@
 Summary: Metacity window manager
 Name: metacity
 Version: %{metacity_version}
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
 Source0: %{metacity_filename}.tar.bz2
 License: GPL
@@ -31,6 +31,7 @@
 Requires: pkgconfig
 
 Requires(post): GConf2 >= 2.14
+Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 
 Patch2: metacity-2.16.0-losing-focus.patch
@@ -90,18 +91,18 @@
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="metacity.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/metacity.schemas > /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/metacity.schemas > /dev/null || :
+fi
 
 %preun 
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  SCHEMAS="metacity.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/metacity.schemas > /dev/null || :
 fi
 
 %postun -p /sbin/ldconfig
@@ -122,6 +123,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-7
+- Fix scripts according to packaging guidelines
+
 * Tue Oct 17 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-6
 - Add missing Requires (#203813)
 




More information about the fedora-cvs-commits mailing list