Hello community, here is the log from the commit of package erlang-rebar for openSUSE:Factory checked in at 2017-07-21 22:49:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/erlang-rebar (Old) and /work/SRC/openSUSE:Factory/.erlang-rebar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "erlang-rebar" Fri Jul 21 22:49:59 2017 rev:5 rq:511574 version:2.6.4+git20160922.576e121 Changes: -------- --- /work/SRC/openSUSE:Factory/erlang-rebar/erlang-rebar-testsuite.changes 2016-10-02 00:09:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.erlang-rebar.new/erlang-rebar-testsuite.changes 2017-07-21 22:50:00.867521342 +0200 @@ -1,0 +2,6 @@ +Wed Jul 12 14:48:15 UTC 2017 - [email protected] + +- Add reproducible.patch to use a constant build time in .beam files +- Normalize zip file timestamps in /usr/bin/rebar (boo#1047218) + +------------------------------------------------------------------- erlang-rebar.changes: same change New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ erlang-rebar-testsuite.spec ++++++ --- /var/tmp/diff_new_pack.Bp6Cn1/_old 2017-07-21 22:50:02.187335167 +0200 +++ /var/tmp/diff_new_pack.Bp6Cn1/_new 2017-07-21 22:50:02.199333474 +0200 @@ -1,7 +1,7 @@ # # spec file for package erlang-rebar-testsuite # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,12 @@ Source98: %{name}.rpmlintrc Patch2: tdeps_update-retest.patch Patch5: erlc_dep_graph-timeout.patch +# PATCH-FIX-OPENSUSE -- bmwiedemann +Patch6: reproducible.patch BuildRequires: erlang >= R13B01 +%if 0%{?suse_version} > 1320 +BuildRequires: strip-nondeterminism +%endif Requires: erlang >= R13B01 Provides: rebar = %{version} Obsoletes: rebar < %{version} @@ -77,10 +82,20 @@ %setup -q -n rebar-%{version} %patch2 -p1 %patch5 -p1 +%patch6 -p1 %build export REBAR_DEPS_PREFER_LIBS=1 make +if [ -e /usr/bin/strip-nondeterminism ] ; then + # normalize timestamps in the zip file + # that starts after 3 lines at offset 51 with "PK" + zipoffs=$(perl -ne 'if(/\APK/){print $offs;exit 0} $offs+=length($_)' rebar) + dd if=rebar of=rebar.zip bs=$zipoffs skip=1 + strip-nondeterminism rebar.zip + dd if=rebar.zip of=rebar bs=$zipoffs seek=1 conv=notrunc + rm rebar.zip +fi %install %if %{normal_build} erlang-rebar.spec: same change ++++++ reproducible.patch ++++++ From: Bernhard M. Wiedemann <bmwiedemann suse de> Set BUILD_TIME to a constant value so that TIME values in .beam files do not differ across builds Index: rebar-2.6.4+git20160922.576e121/bootstrap =================================================================== --- rebar-2.6.4+git20160922.576e121.orig/bootstrap +++ rebar-2.6.4+git20160922.576e121/bootstrap @@ -56,7 +56,6 @@ main(Args) -> [{outdir, "ebin"}, {i, "include"}, DebugFlag, NamespacedTypes, - {d, 'BUILD_TIME', Built}, {d, 'VCS_INFO', VcsInfo}, {d, 'OTP_INFO', OtpInfo}]) of up_to_date ->
