- Reverted last change

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

diff --git a/rpm.macros b/rpm.macros
index 78018e250c3a3fd1bd04c4424a2d9a1a32eceb4b..f0fab51551fd3b4e3f4efb9f10add63c78d55174 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -32,20 +32,27 @@
 %rpmldflags    %{!?debug:-s}
 
 # kernel compiler
-%kgcc          gcc2
-%kgcc_package  gcc2
+%kgcc          gcc
+%kgcc_package  gcc
 
 # Build system path macros.
 #
 %__libtoolize           libtoolize --copy --force
 %__gettextize { \
-    if gettextize --version | grep -q '0\.11\.' ; then \
-        gettextize --copy --force  --intl; \
-       cp -f po/Makevars{.template,}; \
+    if ! gettextize --version | grep -q '0\.10\.' ; then \
+       if grep -qs 'AM_GNU_GETTEXT.*external' configure.{ac,in} ; then \
+           gettextize --copy --force --no-changelog; \
+       else \
+           gettextize --copy --force --no-changelog --intl; \
+       fi; \
+       if [ ! -f po/Makevars ]; then \
+           cp -f po/Makevars{.template,}; \
+       fi; \
     else \
-        gettextize --copy --force; \
+       gettextize --copy --force; \
     fi; \
-}              
+}
+%__autopoint            autopoint --force
 %__automake             automake -a -c -f --foreign
 %__autoconf             autoconf %{?debug:-Wall}
 
@@ -111,14 +118,17 @@
 %_pkgconfigdir /usr/lib/pkgconfig
 
 # Location of top applink dir
-%_applnkdir      /usr/X11R6/share/applnk
+%_applnkdir    /usr/X11R6/share/applnk
 
 # Location pixmaps for applnk/desktop files
-%_pixmapsdir   /usr/X11R6/share/pixmaps
+%_pixmapsdir   /usr/share/pixmaps
 
 # 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")
 
@@ -236,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 \
 }
 
 #-----------------------------------------------------------------