aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Crozat <fcrozat@mandriva.com>2007-07-05 17:31:34 +0000
committerFrederic Crozat <fcrozat@mandriva.com>2007-07-05 17:31:34 +0000
commita10c7439abb9af2cee4c75b8eeacc3e45b72e9ac (patch)
treec879434e5685b0915ecb11bd3ef2249a1ff9aab6
parent36d84594bd1815ab8bb492919900b939001fccea (diff)
downloadrpm-setup-a10c7439abb9af2cee4c75b8eeacc3e45b72e9ac.tar
rpm-setup-a10c7439abb9af2cee4c75b8eeacc3e45b72e9ac.tar.gz
rpm-setup-a10c7439abb9af2cee4c75b8eeacc3e45b72e9ac.tar.bz2
rpm-setup-a10c7439abb9af2cee4c75b8eeacc3e45b72e9ac.tar.xz
rpm-setup-a10c7439abb9af2cee4c75b8eeacc3e45b72e9ac.zip
Fix my previous incorrect changes to gconf macros
-rw-r--r--macros.in10
1 files changed, 4 insertions, 6 deletions
diff --git a/macros.in b/macros.in
index 60d10f1..45403de 100644
--- a/macros.in
+++ b/macros.in
@@ -219,21 +219,19 @@ then %{_update_mime_database_bin} %{_datadir}/mime > /dev/null || true ; fi \
# Install GConf schemas
%post_install_gconf_schemas() if [ -x %{_gconftool_bin} ]; then \
-export GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` && \
SCHEMAS="" \
for SCHEMA in %{*} ; do \
SCHEMAS="$SCHEMAS %{_sysconfdir}/gconf/schemas/$SCHEMA.schemas" \
-done ; fi \
-%{_gconftool_bin} --makefile-install-rule $SCHEMAS > /dev/null || true \
+done \
+GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} --makefile-install-rule $SCHEMAS > /dev/null || true ; fi \
%{nil}
%preun_uninstall_gconf_schemas() if [ "$1" = "0" -a -x %{_gconftool_bin} ]; then \
-export GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` && \
SCHEMAS="" \
for SCHEMA in %{*} ; do \
SCHEMAS="$SCHEMAS %{_sysconfdir}/gconf/schemas/$SCHEMA.schemas" \
-done ; fi \
-%{_gconftool_bin} --makefile-uninstall-rule $SCHEMAS > /dev/null || true \
+done \
+GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} --makefile-uninstall-rule $SCHEMAS > /dev/null || true ; fi \
%{nil}
# Rebuild scrollkeeper database