diff --git a/a2ps-4.14-automake.patch b/a2ps-4.14-automake.patch new file mode 100644 index 0000000..595e68a --- /dev/null +++ b/a2ps-4.14-automake.patch @@ -0,0 +1,37 @@ +--- + Makefile.in | 2 -- + contrib/Makefile.in | 12 ------------ + 2 files changed, 14 deletions(-) + +--- Makefile.in ++++ Makefile.in 2015-03-03 12:08:59.329518342 +0000 +@@ -286,8 +286,6 @@ all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + + .SUFFIXES: +-am--refresh: +- @: + $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +--- contrib/Makefile.in ++++ contrib/Makefile.in 2015-03-03 12:08:38.637518148 +0000 +@@ -320,18 +320,6 @@ all: all-recursive + + .SUFFIXES: + .SUFFIXES: .m4 .in .c .l .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --gnu contrib/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ diff --git a/a2ps.spec b/a2ps.spec index 2712173..2d1e048 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -54,6 +54,7 @@ Patch: a2ps-4.14.diff Patch1: a2ps-4.13-security.patch Patch2: a2ps-4.14-ogonkify.patch Patch3: a2ps-4.14-tempfile.patch +Patch4: a2ps-4.14-automake.patch Patch6: a2ps-4.13-include.patch Patch7: a2ps-4.14-acroread.patch Patch8: a2ps-4.13-base.patch @@ -95,6 +96,7 @@ touch -r configure.in .ref %patch1 -p0 -b .security %patch2 -p1 %patch3 -p1 +%patch4 -p0 -b .norefresh %patch6 -p1 -b .incld %ifarch %ix86 x86_64 %patch7 -p1 @@ -111,7 +113,6 @@ cp -f %SOURCE1 po/ko.po find -type f | grep -vE '(parseppd|parsessh).y' | xargs \ sed -ri 's/59 Temple Place(,| -) Suite 330/51 Franklin Street, Fifth Floor/;s/02111-1307/02110-1301/' touch -r .ref configure.in -find -name Makefile.in | xargs sed -ri '/^am--refresh:/d' find -name Makefile.in | xargs touch %build