diff --git a/a2ps.changes b/a2ps.changes index 633fe4f..10c3426 100644 --- a/a2ps.changes +++ b/a2ps.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 16 09:50:16 UTC 2018 - bwiedemann@suse.com + +- Add reproducible.patch to fix build date (boo#1047218) +- Run build non-parallelized and with make -B because of + poorly specified make build dependencies to make build reproducible + ------------------------------------------------------------------- Thu Jun 29 09:14:23 UTC 2017 - werner@suse.de diff --git a/a2ps.spec b/a2ps.spec index 2807321..4f70f9c 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -48,6 +48,7 @@ Patch15: a2ps-4.14-gperf.patch # PATCH-FIX-SUSE Bug 955194 - CVE-2015-8107: CVE-2015-8107 - a2ps(gnu) v4.14 format string vulnerability Patch16: a2ps-4.14-bnc955194.patch Patch17: a2ps-buildcompare.patch +Patch18: reproducible.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: emacs-nox @@ -57,6 +58,7 @@ BuildRequires: gv BuildRequires: psutils BuildRequires: texlive-latex BuildRequires: timezone +BuildRequires: bison Requires: file Requires: ghostscript-fonts-std Requires: glibc @@ -128,6 +130,7 @@ touch -r configure.in .ref %patch16 -p0 %patch17 -p1 %patch0 -b .p0 +%patch18 -p1 cp -f %{SOURCE3} 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/' @@ -153,9 +156,10 @@ find -name Makefile.in | xargs touch con="$con ${in##*/}" done popd - make %{?_smp_mflags} -C contrib/ ${con} LDFLAGS="-pie" + make -C contrib/ ${con} LDFLAGS="-pie" sh ./config.status - make %{?_smp_mflags} PSFONT_PATH=%{_datadir}/ghostscript/fonts LDFLAGS="-pie" MAKEINFO='makeinfo --force' + # the build system is awful so we need to build with -B and avoid parallelism + make PSFONT_PATH=%{_datadir}/ghostscript/fonts LDFLAGS="-pie" MAKEINFO='makeinfo --force' -B pushd doc texi2html a2ps.texi popd diff --git a/reproducible.patch b/reproducible.patch new file mode 100644 index 0000000..a05ee7e --- /dev/null +++ b/reproducible.patch @@ -0,0 +1,13 @@ +Index: a2ps-4.14/man/help2man +=================================================================== +--- a2ps-4.14.orig/man/help2man ++++ a2ps-4.14/man/help2man +@@ -164,7 +164,7 @@ my ($help_text, $version_text) = map { + or die "$this_program: can't get `--$_' info from $ARGV[0]\n" + } qw(help version); + +-my $date = strftime "%B %Y", localtime; ++my $date = strftime "%B %Y", gmtime($ENV{SOURCE_DATE_EPOCH} || time); + (my $program = $ARGV[0]) =~ s!.*/!!; + my $package = $program; + my $version;