Hello community, here is the log from the commit of package nested for openSUSE:Factory checked in at 2017-10-23 16:52:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nested (Old) and /work/SRC/openSUSE:Factory/.nested.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nested" Mon Oct 23 16:52:17 2017 rev:10 rq:535774 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/nested/nested.changes 2017-09-25 13:59:52.370981689 +0200 +++ /work/SRC/openSUSE:Factory/.nested.new/nested.changes 2017-10-23 16:52:43.318284958 +0200 @@ -1,0 +2,5 @@ +Sun Oct 22 07:48:33 UTC 2017 - [email protected] + +- Add nested-1.4-reproducible-mo-file.patch to make builds reproducible + +------------------------------------------------------------------- New: ---- nested-1.4-reproducible-mo-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nested.spec ++++++ --- /var/tmp/diff_new_pack.GawaGY/_old 2017-10-23 16:52:47.162105064 +0200 +++ /var/tmp/diff_new_pack.GawaGY/_new 2017-10-23 16:52:47.162105064 +0200 @@ -31,8 +31,10 @@ Url: https://github.com/carlos-jenkins/nested Source0: https://github.com/carlos-jenkins/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.desktop -# PATCH-FIX-UPSTREAM reproducible.patch -- allow for reproducible builds +# PATCH-FIX-UPSTREAM reproducible.patch -- fixed copyright year for reproducible builds Patch0: reproducible.patch +# PATCH-FIX-UPSTREAM sort po files for reproducible builds +Patch1: nested-1.4-reproducible-mo-file.patch Source2: %{name}.rpmlintrc BuildRequires: fdupes BuildRequires: python-devel @@ -56,6 +58,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build python setup.py build ++++++ nested-1.4-reproducible-mo-file.patch ++++++ https://github.com/carlos-jenkins/nested/pull/1 commit 53e84ac4d75de6b3c7027a2d9a0d24ed96d6f998 Author: Bernhard M. Wiedemann <[email protected]> Date: Sun Oct 22 09:30:24 2017 +0200 Sort list of .po files so that package builds always give the same result See https://reproducible-builds.org/ for why this is good. Without this patch, /usr/share/locale/ru_RU/LC_MESSAGES/nested.mo (and possibly others) would sometimes differ as seen in http://rb.zq1.de/compare.factory-20171017/nested-compare.out diff --git a/l10n/compile_mo.py b/l10n/compile_mo.py index 2301f10..b91c978 100755 --- a/l10n/compile_mo.py +++ b/l10n/compile_mo.py @@ -19,7 +19,7 @@ def build_mo_files(): shutil.rmtree(locale_dir) os.mkdir(locale_dir) - available_langs = os.listdir(po_dir) + available_langs = sorted(os.listdir(po_dir)) available_langs = filter(lambda file: file.endswith('.po'), available_langs) available_langs = map(lambda file: file[:-3], available_langs) ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.GawaGY/_old 2017-10-23 16:52:47.218102444 +0200 +++ /var/tmp/diff_new_pack.GawaGY/_new 2017-10-23 16:52:47.218102444 +0200 @@ -1,8 +1,21 @@ -Index: nested-1.4/nested/examples/Manpage/Manpage.t2t -=================================================================== ---- nested-1.4.orig/nested/examples/Manpage/Manpage.t2t -+++ nested-1.4/nested/examples/Manpage/Manpage.t2t -@@ -246,5 +246,5 @@ http://sourceforge.net/p/nestededitor/ti +https://github.com/carlos-jenkins/nested/pull/2 + +commit 2990f8a6fbb3b72a9cfa45235d1fed091965ebf9 +Author: Bernhard M. Wiedemann <[email protected]> +Date: Sun Oct 22 09:36:19 2017 +0200 + + Do not claim copyright for future years + + e.g. when building this in 2018, it would claim copyright for 2018 + without any author having done anything + + This also helps to make this package build reproducibly. + +diff --git a/nested/examples/Manpage/Manpage.t2t b/nested/examples/Manpage/Manpage.t2t +index 2082a68..a32628a 100644 +--- a/nested/examples/Manpage/Manpage.t2t ++++ b/nested/examples/Manpage/Manpage.t2t +@@ -246,5 +246,5 @@ http://sourceforge.net/p/nestededitor/tickets/ = COPYRIGHT =[copyright]
