- more macros backported (_desktopdir, gconf_schema_install)

  - now it should really provide macros 1.118

Changed files:
    rpm.macros -> 1.85.2.8

diff --git a/rpm.macros b/rpm.macros
index 8e698315f1a445751e7ef6ad8c3619e3046b1a88..b2280c306b456a0c9c79e18af17ab44d99cb3314 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -113,7 +113,10 @@
 %_pkgconfigdir /usr/lib/pkgconfig
 
 # Location of top applink dir
-%_applnkdir      /usr/X11R6/share/applnk
+%_applnkdir    /usr/X11R6/share/applnk
+
+# Location of desktop files
+%_desktopdir   /usr/X11R6/share/applications
 
 # Location pixmaps for applnk/desktop files
 %_pixmapsdir   /usr/X11R6/share/pixmaps
@@ -169,6 +172,17 @@
 ; do echo $l; done >> %1 \
 }
 
+#-----------------------------------------------------------------
+# Update all GConf2 schemas
+#
+# Requires: GConf2
+#
+%gconf_schema_install { umask 022; \
+    GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" \
+    /usr/bin/gconftool-2 --makefile-install-rule \
+    /etc/gconf/schemas/*.schemas > /dev/null \
+}
+
 #-----------------------------------------------------------------
 # find and gzip all files in %{_mandir} and %{infodir}
 #