- more gettextize fixes

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

diff --git a/rpm.macros b/rpm.macros
index 83f5ffd5c6100774a5f38c47b4f60da161bd9907..c9053dec045cb2cc86be4cb15cd56b73c14efcca 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -38,7 +38,18 @@
 # Build system path macros.
 #
 %__libtoolize           libtoolize --copy --force
-%__gettextize           gettextize --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; \
+       else \
+               gettextize --copy --force; \
+    fi; \
+}              
 %__automake             automake -a -c -f --foreign
 %__autoconf             autoconf %{?debug:-Wall}
 
@@ -217,13 +228,24 @@ echo "Compress kernel modules if any."; \
        find $RPM_BUILD_ROOT/lib/modules -name \*.o -type f -print | \
        xargs -r %{__gzip} -9nf; \
           find $RPM_BUILD_ROOT/lib/modules -name \*.o -type l -printf "%p %l\n" | \
-          while read a b; do ln -sf $b.gz $a.gz; rm -f $a; done \
+          while read a b; do ln -sf $b.gz $a.gz; rm -f $a; done; \
     fi; \
 } }
 
 %_source_payload        w9.gzdio
 %_binary_payload        w9.bzdio
 
+#-----------------------------------------------------------------
+# Update all GConf2 schemas
+#
+# Requires: GConf2
+#
+%gconf_schema_install { \
+    GCONF_CONFIG_SOURCE="" \
+    %{_bindir}/gconftool-2 --makefile-install-rule \
+    /etc/X11/GNOME2/gconf/schemas/*.schemas > /dev/null \
+}
+
 #-----------------------------------------------------------------
 # post %install sequence:
 # - autodeps exceptions