[mate-conf] readd macros.mateconf and mate-conf reload patch

[Dan Mashal]

commit c9e9913cee3188ff6d6ee79bd98ea828a90d5b06
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Wed Sep 19 12:15:52 2012 -0700

    readd macros.mateconf and mate-conf reload patch

 macros.mateconf              |   86 ++++++++++++++++++++++++++++++++++++++++++
 mate-conf-1.4.0-reload.patch |   11 +++++
 2 files changed, 97 insertions(+), 0 deletions(-)
---
diff --git a/macros.mateconf b/macros.mateconf
new file mode 100644
index 0000000..ae99e17
--- /dev/null
+++ b/macros.mateconf
@@ -0,0 +1,86 @@
+-#
+-# RPM macros for mateconf applications.
+-#
+-# (c) 2006-2007 SUSE LINUX
+-# Author: Stanislav Brabec <sbrabec at suse.cz>
+-# (c) 2009 Red Hat, Inc
+-# Author: Toshio Kuratomi <toshio at fedoraproject.org>
+-#
+-# License: LGPLv2+
+-#
+-# Usage:
+-#
+-# Preamble:
+-# Requires(pre): MateConf2
+-# Requires(preun): MateConf2
+-# Requires(post): MateConf2
+-#
+-# schemas names are without path and suffix
+-#
+-#
+-# %pre
+-# %mateconf_schema_obsolete schema1
+-# %mateconf_schema_prepare schema2 schema3
+-#
+-# %preun
+-# %mateconf_schema_remove schema2 schema3
+-#
+-# %post
+-# %mateconf_schema_upgrade schema2 schema3
+-#
+-# %files
+-# %{_sysconfdir}/mateconf/schemas/schema2.schemas
+-# %{_sysconfdir}/mateconf/schemas/schema3.schemas
+-
+-# Copy schemas from old package for later uninstall on upgrade
+-%mateconf_schema_prepare() \
+-if [ "$1" -gt 1 ] ; then \
+-    rm -rf %{_localstatedir}/lib/rpm-state/mateconf/* \
+-    for schema in %{*} ; do \
+-        if test -f %{_sysconfdir}/mateconf/schemas/"$schema".schemas ; then \
+-            cp -p %{_sysconfdir}/mateconf/schemas/"$schema".schemas %{_localstatedir}/lib/rpm-state/mateconf/ || : \
+-        fi \
+-    done \
+-fi \
+-%{nil}
+-
+-# Macro to remove schemas.  Not meant to be used publically
+-%_do_mateconf_schema_remove() \
+-        if test -f %{_sysconfdir}/mateconf/schemas/"$schema".schemas ; then \
+-            export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source` \
+-            mateconftool-2 --makefile-uninstall-rule %{_sysconfdir}/mateconf/schemas/"$schema".schemas > /dev/null || : \
+-        fi \
+-%{nil}
+-
+-# Remove schemas unconditionally
+-%mateconf_schema_obsolete() \
+-for schema in %{*} ; do \
+-    %_do_mateconf_schema_remove \
+-done \
+-%{nil}
+-
+-# Remove schemas on package removal (not upgrade)
+-%mateconf_schema_remove() \
+-if [ "$1" -eq 0 ] ; then \
+-    for schema in %{*} ; do \
+-        %_do_mateconf_schema_remove \
+-    done \
+-fi \
+-%{nil}
+-
+-%mateconf_schema_upgrade() \
+-for schema in %{*} ; do \
+-    if test -f %{_localstatedir}/lib/rpm-state/mateconf/"$schema".schemas ; then \
+-        cmp --quiet %{_sysconfdir}/mateconf/schemas/"$schema".schemas %{_localstatedir}/lib/rpm-state/mateconf/"$schema".schemas \
+-        if test $? != 0; then\
+-            %_do_mateconf_schema_remove \
+-            export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source` \
+-            mateconftool-2 --makefile-install-rule %{_sysconfdir}/mateconf/schemas/"$schema".schemas > /dev/null || : \
+-        fi \
+-        rm -f %{_localstatedir}/lib/rpm-state/mateconf/"$schema".schemas \
+-    else \
+-        export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source` \
+-        mateconftool-2 --makefile-install-rule %{_sysconfdir}/mateconf/schemas/"$schema".schemas > /dev/null || : \
+-    fi \
+-done \
+-%{nil}
diff --git a/mate-conf-1.4.0-reload.patch b/mate-conf-1.4.0-reload.patch
new file mode 100644
index 0000000..7984f9b
--- /dev/null
+++ b/mate-conf-1.4.0-reload.patch
@@ -0,0 +1,11 @@
+--- GConf-2.18.0.1/mateconf/mateconftool.c.reload	2007-03-02 17:10:13.000000000 -0500
++++ GConf-2.18.0.1/mateconf/mateconftool.c	2007-03-13 02:21:29.000000000 -0400
+@@ -3780,6 +3780,8 @@
+       ++args;
+     }
+ 
++  g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " MATECONF_SERVERDIR "/" MATECONFD, NULL, NULL, NULL, NULL); 
++
+   retval |= do_sync (conf);
+   return retval;
+ }