- corrcted gconf_schema_install macro (thx wolf)

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 6876503c0fde12d5a089c40716c02c183d36dea6..b8f5a0376dc78f64300fcbc7342d276eac062bbc 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -39,15 +39,20 @@
 #
 %__libtoolize           libtoolize --copy --force
 %__gettextize { \
-    if [ -f po/Makevars ]; then \
-        gettextize --copy --force; \
-    elif 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; \
+           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}
 
@@ -239,8 +244,8 @@ echo "Compress kernel modules if any."; \
 # Requires: GConf2
 #
 %gconf_schema_install { \
-    GCONF_CONFIG_SOURCE="" \
-    %{_bindir}/gconftool-2 --makefile-install-rule \
+    GCONF_CONFIG_SOURCE="xml:readwrite:/etc/X11/GNOME2/gconf/gconf.xml.defaults" \
+    /usr/X11R6/bin/gconftool-2 --makefile-install-rule \
     /etc/X11/GNOME2/gconf/schemas/*.schemas > /dev/null \
 }