diff --git a/a2ps-external-libtool.patch b/a2ps-external-libtool.patch new file mode 100644 index 0000000..93b5cf7 --- /dev/null +++ b/a2ps-external-libtool.patch @@ -0,0 +1,12 @@ +--- a2ps-4.13/configure.external-libtool 2007-02-28 22:32:48.000000000 +0100 ++++ a2ps-4.13/configure 2007-02-28 22:32:48.000000000 +0100 +@@ -2673,7 +2673,8 @@ + LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++#LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='/usr/bin/libtool' + + # Redirect the config.log output again, so that the ltconfig log is not + # clobbered by the next message. diff --git a/a2ps.spec b/a2ps.spec index 6c4ccc0..4171b72 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -29,15 +29,13 @@ Patch21: a2ps-4.13-malloc.patch Patch22: a2ps-shell.patch Patch23: a2ps-includes.patch Patch24: a2ps-underquoted.patch -Patch25: a2ps-autoconf.patch Patch26: a2ps-make-fonts-map.patch Patch27: a2ps-netscape.patch Patch28: a2ps-wdiff.patch Patch29: a2ps-U.patch Patch30: a2ps-psset.patch Patch31: a2ps-mb.patch -Patch32: a2ps-perl.patch -Patch33: a2ps-build.patch +Patch34: a2ps-external-libtool.patch Requires: fileutils sh-utils info BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo, groff BuildRequires: ImageMagick @@ -62,6 +60,10 @@ and medias. %prep %setup -q -n %{name}-4.13 -a 1 + +# use __timestamp_configure.in to hold the configure.in timestamp +touch -r configure.in __timestamp_configure.in + %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -108,8 +110,8 @@ and medias. # Fixed m4 files. %patch24 -p1 -b .underquoted -# Fixed configure.in. -%patch25 -p1 -b .autoconf +# Use external libtool (bug #225235). +%patch34 -p1 -b .external-libtool # Fix problems in make_fonts_map script (bug #142299). Patch from # Michal Jaegermann. @@ -130,27 +132,22 @@ and medias. # Fixed multibyte handling (bug #212154). %patch31 -p1 -b .mb -# Make ogonkify build. -%patch32 -p1 -b .perl - # Fix reference to a2ps binary (bug #112930). perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el -libtoolize --copy --force -cp /usr/share/aclocal/libtool.m4 m4/ -aclocal -I m4 -autoconf -pushd ogonkify -autoconf -popd - -%patch33 -p1 -b .build chmod -x lib/basename.c lib/xmalloc.c +# restore timestamps of patched files +touch -r __timestamp_configure.in configure.in +rm __timestamp_configure.in +touch -r config.h.in.euc config.h.in +touch -r configure.orig configure Makefile.in +touch -r src/Makefile.am.euc src/Makefile.am +touch -r fonts/Makefile.in src/Makefile.in etc/Makefile.in lib/Makefile.in + %build chmod 644 {po/ja.po,encoding/euc-jp.edf,README.eucJP}.euc chmod 644 encoding/euc-kr.edf.euckr -touch `find $PWD` EMACS=emacs %configure \ --with-medium=_glibc \ --enable-kanji @@ -247,6 +244,9 @@ exit 0 %dir %{_datadir}/a2ps %changelog +* Thu Mar 8 2007 Tim Waugh +- Use external libtool and don't run the autotools (bug #225235). + * Wed Feb 28 2007 Tim Waugh 4.13b-61 - Clean up tmpdir in pdiff (bug #214400). - Fixed permissions on C source files (bug #225235).