From 86c052f77ced438a696ff9643c27ce6873a371ea Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Fri, 12 Apr 2013 12:59:31 -0400 Subject: [PATCH] Fix upgrade macro the macro gconf_schema_upgrade was running --makefile-uninstall-rule on the new schema instead of the old one. This could lead to a build up of cruft in the default gconf source. --- macros.gconf2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.gconf2 b/macros.gconf2 index 94b22b4..928ec70 100644 --- a/macros.gconf2 +++ b/macros.gconf2 @@ -73,8 +73,8 @@ for schema in %{*} ; do \ if test -f %{_localstatedir}/lib/rpm-state/gconf/"$schema".schemas ; then \ cmp --quiet %{_sysconfdir}/gconf/schemas/"$schema".schemas %{_localstatedir}/lib/rpm-state/gconf/"$schema".schemas \ if test $? != 0; then\ - %_do_gconf_schema_remove \ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ + gconftool-2 --makefile-uninstall-rule %{_localstatedir}/lib/rpm-state/gconf/"$schema".schemas > /dev/null || : \ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/"$schema".schemas > /dev/null || : \ fi \ rm -f %{_localstatedir}/lib/rpm-state/gconf/"$schema".schemas \