- 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
%__libtoolize libtoolize --copy --force
%__gettextize { \
if ! gettextize --version | grep -q '0\.10\.' ; then \
%__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; \
- 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; \
+}
+%__autopoint autopoint --force
%__automake automake -a -c -f --foreign
%__autoconf autoconf %{?debug:-Wall}
%__automake automake -a -c -f --foreign
%__autoconf autoconf %{?debug:-Wall}