Hello community, here is the log from the commit of package warzone2100 for openSUSE:Factory checked in at 2019-04-08 10:38:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/warzone2100 (Old) and /work/SRC/openSUSE:Factory/.warzone2100.new.3908 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "warzone2100" Mon Apr 8 10:38:01 2019 rev:4 rq:691898 version:3.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/warzone2100/warzone2100.changes 2017-08-24 18:31:32.209726479 +0200 +++ /work/SRC/openSUSE:Factory/.warzone2100.new.3908/warzone2100.changes 2019-04-08 10:39:43.463285839 +0200 @@ -1,0 +2,6 @@ +Thu Apr 4 08:55:57 UTC 2019 - Bernhard Wiedemann <[email protected]> + +- Add reproducible.patch to sort zip file list + to make package build reproducible (boo#1041090) + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ warzone2100.spec ++++++ --- /var/tmp/diff_new_pack.20NJPu/_old 2019-04-08 10:39:47.099287019 +0200 +++ /var/tmp/diff_new_pack.20NJPu/_new 2019-04-08 10:39:47.103287020 +0200 @@ -27,6 +27,8 @@ Source99: %{name}.changes # PATCH-FIX-UPSTREAM https://github.com/Warzone2100/warzone2100/pull/89 Patch2: system-miniupnpc.patch +# PATCH-FIX-UPSTREAM https://github.com/Warzone2100/warzone2100/pull/98 +Patch3: reproducible.patch BuildRequires: asciidoc BuildRequires: automake BuildRequires: bison @@ -111,6 +113,7 @@ %prep %setup -q %patch2 -p1 +%patch3 -p1 # constant timestamp for reproducible builds modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")" ++++++ reproducible.patch ++++++ https://github.com/Warzone2100/warzone2100/pull/98 commit 714399bfd5c9effa0a9b1bba8f26b625eadeb1da Author: Bernhard M. Wiedemann <[email protected]> Date: Sun Aug 27 07:07:24 2017 +0200 Make zip file creation reproducible by adding -X option to not store extra UNIX timestamps and by sorting the recursed input file list See https://reproducible-builds.org/ for why this is good. diff --git a/data/Makefile.am b/data/Makefile.am index bc269123b..0cc29fe9f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,7 +4,7 @@ stamp: touch stamp %.wz: $(abs_srcdir)/% stamp - (cd $(srcdir)/$(notdir $<) && $(ZIP) -r0 $(ZIP_UPDATE) $(abs_builddir)/$@ $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -x '*svn*' -x '*Makefile*' -x '*.svg' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do" + (cd $(srcdir)/$(notdir $<) && $(ZIP) -X -r0 $(ZIP_UPDATE) $(abs_builddir)/$@ $$(find $(filter-out stamp,$(filter-out $<,$(^:$</%=%))) -type f | LC_ALL=C sort) -x '*svn*' -x '*Makefile*' -x '*.svg' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do" $(ZIP) -T $@ rm -f stamp
