From: aflinta <aflinta@pld-linux.org>
Date: Fri, 25 Mar 2005 00:03:43 +0000 (+0000)
Subject: - final solution for GConf macros
X-Git-Tag: auto/th/rpm-4_4_1-0_7~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-macros.git;a=commitdiff_plain;h=46885239b0df56bf95484dadef1217711d3ce6ff

- final solution for GConf macros

Changed files:
    rpm.macros -> 1.195
---

diff --git a/rpm.macros b/rpm.macros
index b249e28..a0a8318 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -365,9 +365,17 @@ echo "Compress kernel modules if any."; \
 #
 # Requires: GConf2
 #
-%gconf_schema_install /usr/lib/rpm/gconf-schema-install
-
-%gconf_schema_uninstall /usr/lib/rpm/gconf-schema-uninstall
+%gconf_schema_install() \
+    umask 022; \
+    GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" \
+    /usr/bin/gconftool-2 --makefile-install-rule %{?1}%{!?1:/etc/gconf/schemas/*.schemas} > /dev/null \
+    %{nil}
+
+%gconf_schema_uninstall() \
+    umask 022; \
+    GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" \
+    /usr/bin/gconftool-2 --makefile-uninstall-rule %{?1} > /dev/null \
+    %{nil}
 
 #-----------------------------------------------------------------
 # post %install sequence: