Hello community, here is the log from the commit of package solfege for openSUSE:Factory checked in at 2020-02-24 15:54:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solfege (Old) and /work/SRC/openSUSE:Factory/.solfege.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solfege" Mon Feb 24 15:54:33 2020 rev:43 rq:778649 version:3.23.4 Changes: -------- --- /work/SRC/openSUSE:Factory/solfege/solfege.changes 2020-02-20 14:54:25.354175303 +0100 +++ /work/SRC/openSUSE:Factory/.solfege.new.26092/solfege.changes 2020-02-24 15:56:55.612062061 +0100 @@ -1,0 +2,6 @@ +Mon Feb 24 04:23:56 UTC 2020 - Bernhard Wiedemann <[email protected]> + +- Add reproducible.patch to sort python glob to make + package build reproducible + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solfege.spec ++++++ --- /var/tmp/diff_new_pack.hB8f4Q/_old 2020-02-24 15:56:56.732064377 +0100 +++ /var/tmp/diff_new_pack.hB8f4Q/_new 2020-02-24 15:56:56.732064377 +0100 @@ -55,6 +55,8 @@ Patch0: solfege-configure-fix.dif Patch1: solfege-python-fixcompile.patch Patch2: solfege-nogenreadmeetc.patch +# PATCH-FIX-UPSTREAM - sent by mail to tca@gnu - is upstream orphaned? +Patch3: reproducible.patch Requires: lilypond-century-schoolbook-l-fonts Requires: lilypond-emmentaler-fonts Requires: lilypond-fonts-common @@ -74,6 +76,7 @@ %patch0 %patch1 %patch2 +%patch3 -p1 for i in `grep -rl "/usr/bin/env python "`;do $(chmod 0755 ${i} ; sed -i '1s/^#!.*/#!\/usr\/bin\/python3 /' ${i}) ;done #for i in `grep -rl "!/usr/bin/python "`;do $(chmod 0755 ${i} ; sed -i '1s/^#!.*/#!\/usr\/bin\/python3 /' ${i}) ;done ++++++ reproducible.patch ++++++ commit 29fbd6ac51c1983dd8cb29a02e7a3554d2243a08 Author: Bernhard M. Wiedemann <[email protected]> Date: Sun Feb 23 21:12:35 2020 +0100 Sort input file list so that solfege-3.23.4/solfege/languages.py in openSUSE's solfege package builds in a reproducible way in spite of indeterministic filesystem readdir order and http://bugs.python.org/issue30461 See https://reproducible-builds.org/ for why this is good. diff --git a/tools/buildutil.py b/tools/buildutil.py index fce99b9..c908f99 100644 --- a/tools/buildutil.py +++ b/tools/buildutil.py @@ -35,7 +35,7 @@ C_locale_idx = 1 languages = [ 'system default', 'English/United States [en-us]',""", file=f) - for fn in glob.glob("po/*.po"): + for fn in sorted(glob.glob("po/*.po")): print(" '%s'," % os.path.splitext(os.path.basename(fn))[0], file=f) print("]", file=f) f.close()
