Dr. Werner Fink 2015-03-03 12:11:06 +00:00 committed by Git OBS Bridge
parent fb82ba88b8
commit 37e6afad76
2 changed files with 39 additions and 1 deletions

37
a2ps-4.14-automake.patch Normal file
View File

@ -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 \

View File

@ -54,6 +54,7 @@ Patch: a2ps-4.14.diff
Patch1: a2ps-4.13-security.patch Patch1: a2ps-4.13-security.patch
Patch2: a2ps-4.14-ogonkify.patch Patch2: a2ps-4.14-ogonkify.patch
Patch3: a2ps-4.14-tempfile.patch Patch3: a2ps-4.14-tempfile.patch
Patch4: a2ps-4.14-automake.patch
Patch6: a2ps-4.13-include.patch Patch6: a2ps-4.13-include.patch
Patch7: a2ps-4.14-acroread.patch Patch7: a2ps-4.14-acroread.patch
Patch8: a2ps-4.13-base.patch Patch8: a2ps-4.13-base.patch
@ -95,6 +96,7 @@ touch -r configure.in .ref
%patch1 -p0 -b .security %patch1 -p0 -b .security
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p0 -b .norefresh
%patch6 -p1 -b .incld %patch6 -p1 -b .incld
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%patch7 -p1 %patch7 -p1
@ -111,7 +113,6 @@ cp -f %SOURCE1 po/ko.po
find -type f | grep -vE '(parseppd|parsessh).y' | xargs \ 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/' sed -ri 's/59 Temple Place(,| -) Suite 330/51 Franklin Street, Fifth Floor/;s/02111-1307/02110-1301/'
touch -r .ref configure.in touch -r .ref configure.in
find -name Makefile.in | xargs sed -ri '/^am--refresh:/d'
find -name Makefile.in | xargs touch find -name Makefile.in | xargs touch
%build %build