From cac6c3ada4cce8625518f2e3e346f7273ff6ca4756cf30e67c871e2c300fb94a Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 3 Mar 2015 13:13:58 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Publishing/a2ps?expand=0&rev=53
---
 a2ps-4.14-automake.patch | 26 ++++++++++++++++++--------
 a2ps.spec                |  5 ++---
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/a2ps-4.14-automake.patch b/a2ps-4.14-automake.patch
index 595e68a..cf39849 100644
--- a/a2ps-4.14-automake.patch
+++ b/a2ps-4.14-automake.patch
@@ -1,10 +1,10 @@
 ---
  Makefile.in         |    2 --
- contrib/Makefile.in |   12 ------------
- 2 files changed, 14 deletions(-)
+ contrib/Makefile.in |   22 ----------------------
+ 2 files changed, 24 deletions(-)
 
 --- Makefile.in
-+++ Makefile.in	2015-03-03 12:08:59.329518342 +0000
++++ Makefile.in	2015-03-03 12:08:59.000000000 +0000
 @@ -286,8 +286,6 @@ all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
@@ -15,8 +15,8 @@
  	@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
++++ contrib/Makefile.in	2015-03-03 13:03:12.306018770 +0000
+@@ -320,28 +320,6 @@ all: all-recursive
  
  .SUFFIXES:
  .SUFFIXES: .m4 .in .c .l .lo .o .obj
@@ -32,6 +32,16 @@
 -	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 \
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
diff --git a/a2ps.spec b/a2ps.spec
index 26ee98b..d0eac9f 100644
--- a/a2ps.spec
+++ b/a2ps.spec
@@ -128,11 +128,10 @@ find -name Makefile.in | xargs touch
    for m4 in *.m4; do
      in=${m4%.*}.in
      rm -f ${in} ${m4%.*}
-     /usr/bin/m4 ${m4}
-     sed -e 's/@BKL@/[/g;s/@BKR@/]/g;s/@DLR@/$/g;s/@PND@/#/g'> ${in}-tmp
-     mv ${in}-tmp ${in}
+     con="$con ${in##*/}"
    done
  popd
+ make %{?_smp_mflags} -C contrib/ ${con} LDFLAGS="-pie"
  sh ./config.status
  make %{?_smp_mflags} PSFONT_PATH=%{_datadir}/ghostscript/fonts LDFLAGS="-pie" MAKEINFO='makeinfo --force'
  pushd doc