- added _gtkdocdir definition

[packages/rpm-build-macros.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index e5b4b7dc0a08898eec175f0857ddc982f2cc18bd..071725526f0d312a735009b54fca31a567559ec2 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -126,6 +126,9 @@
 # Location of fonts directories
 %_fontsdir     /usr/share/fonts
 
+# Location of Gtk and associated libraries documentation
+_gtkdocdir  %{_defaultdocdir}/gtk-doc/html
+
 # Current date
 %date          %(LC_ALL="C" date +"%a %b %d %Y")
 
@@ -243,10 +246,10 @@ echo "Compress kernel modules if any."; \
 #
 # Requires: GConf2
 #
-%gconf_schema_install { \
-    GCONF_CONFIG_SOURCE="" \
-    %{_bindir}/gconftool-2 --makefile-install-rule \
-    /etc/X11/GNOME2/gconf/schemas/*.schemas > /dev/null \
+%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 \
 }
 
 #-----------------------------------------------------------------