Author: glen Date: Fri Aug 29 15:58:36 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- check for /usr/bin/gconftool-2 existence in %gconf_schema_* macros, in case
pkg and GConf2 are removed in same transaction
---- Files affected:
SOURCES:
rpm.macros (1.474 -> 1.475)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.474 SOURCES/rpm.macros:1.475
--- SOURCES/rpm.macros:1.474 Tue Aug 26 15:58:55 2008
+++ SOURCES/rpm.macros Fri Aug 29 17:58:30 2008
@@ -519,14 +519,18 @@
# Requires: GConf2
#
%gconf_schema_install() \
- 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; \
+ 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; \
%{nil}
%gconf_schema_uninstall() \
-if [ $1 = 0 ]; then \
+if [ $1 = 0 -a -x /usr/bin/gconftool-2 ]; then \
umask 022; \
- GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults"
/usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/%{?1} >
/dev/null \
+ GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" \\\
+ /usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/%{?1}
> /dev/null \
fi; \
%{nil}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.474&r2=1.475&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
