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

@@ -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 \