SOURCES: rpm.macros - check only on uninstall

glen glen at pld-linux.org
Fri Aug 29 18:01:09 CEST 2008


Author: glen                         Date: Fri Aug 29 16:01:09 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- check only on uninstall

---- Files affected:
SOURCES:
   rpm.macros (1.475 -> 1.476) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.475 SOURCES/rpm.macros:1.476
--- SOURCES/rpm.macros:1.475	Fri Aug 29 17:58:30 2008
+++ SOURCES/rpm.macros	Fri Aug 29 18:01:03 2008
@@ -519,11 +519,9 @@
 # Requires: GConf2
 #
 %gconf_schema_install() \
-	if [ -x /usr/bin/gconftool-2 ]; then \
-		umask 022; \
-		GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" \\\
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/%{?1}%{!?1:*.schemas} > /dev/null; \
-	fi; \
+	umask 022; \
+	GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" \\\
+	/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/%{?1}%{!?1:*.schemas} > /dev/null; \
 %{nil}
 
 %gconf_schema_uninstall() \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.475&r2=1.476&f=u



More information about the pld-cvs-commit mailing list