- added 4.1-branch-po-updates (updates for message changed by 4.1-branch patch)

- link patch - add dependencies to lib*_LIBADD instead of hacking lib*.la
- beecrypt-opt patch - don't override optflags in libbeecrypt on x86
- changes in rpm.macros:
  - more heuristics in %%__gettextize (allow non-external gt 0.11 and external
    gt without po/Makevars)
  - new %%__autopoint macro (=autopoint --force)
- avoid build trap - define __gettextize to not require very fresh rpm to build
- release 5 (beecrypt rel. 2)

Changed files:
    rpm.macros -> 1.94

diff --git a/rpm.macros b/rpm.macros
index 36d079a72f15fdd2904a7af6bcc7eb5c96e20005..e5b4b7dc0a08898eec175f0857ddc982f2cc18bd 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -40,16 +40,19 @@
 %__libtoolize           libtoolize --copy --force
 %__gettextize { \
     if ! gettextize --version | grep -q '0\.10\.' ; 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 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}