X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.macros;h=289ecccd02461c477252947c2625676f95c71698;hb=7f2290787ba16b62cac36be5293016ea17ed5d5f;hp=c9053dec045cb2cc86be4cb15cd56b73c14efcca;hpb=a11bb62097fa963b1d37448ada7b9ae237f7f21e;p=packages%2Frpm.git

diff --git a/rpm.macros b/rpm.macros
index c9053de..289eccc 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -32,24 +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 \
-       if [ -f po/Makevars ]; then \
-           gettextize --copy --force --no-changelog; \
-       else \
-           gettextize --copy --force --no-changelog --intl; \
-	       cp -f po/Makevars{.template,}; \
-	   fi; \
+    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; \
+	    gettextize --copy --force --no-changelog --intl; \
+	fi; \
+	if [ ! -f po/Makevars ]; then \
+	    cp -f po/Makevars{.template,}; \
+	fi; \
+    else \
+	gettextize --copy --force; \
     fi; \
-}		
+}
+%__autopoint            autopoint --force
 %__automake             automake -a -c -f --foreign
 %__autoconf             autoconf %{?debug:-Wall}
 
@@ -115,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	%{_prefix}/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")
 
@@ -240,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 \
 }
 
 #-----------------------------------------------------------------