From 16f28618b94af7889b671f894a8bf3d7eefe5812d2b88cd13a6dd86d78ed28d6 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 20 Dec 2017 12:20:17 +0000 Subject: [PATCH] Accepting request 558817 from home:bmwiedemann:branches:X11:windowmanagers Add WindowMaker-0.95.8-reproducible.patch to make build reproducible OBS-URL: https://build.opensuse.org/request/show/558817 OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=46 --- WindowMaker-0.95.8-reproducible.patch | 35 +++++++++++++++++++++++++++ WindowMaker.changes | 5 ++++ WindowMaker.spec | 3 +++ 3 files changed, 43 insertions(+) create mode 100644 WindowMaker-0.95.8-reproducible.patch diff --git a/WindowMaker-0.95.8-reproducible.patch b/WindowMaker-0.95.8-reproducible.patch new file mode 100644 index 0000000..69bffca --- /dev/null +++ b/WindowMaker-0.95.8-reproducible.patch @@ -0,0 +1,35 @@ +could be upstreamed, but upstream seems dead +with lists.windowmaker.org down and the last git commit is from March + +commit e9ab99877b71669a75c1c1a43c1fb24cb32c1bdf +Author: Bernhard M. Wiedemann +Date: Tue Dec 19 21:13:21 2017 +0100 + + texi2txt: Use ChangeLog date instead of build date + + in order to make builds reproducible. + See https://reproducible-builds.org/ for why this is good. + + This date call works with GNU date and BSD date. + + Without this patch, /usr/share/doc/packages/WindowMaker/README.i18n + will differ in the line + Published by The Window Maker team on ... + + --- + An alternative solution could use the $SOURCE_DATE_EPOCH variable + defined in https://reproducible-builds.org/specs/source-date-epoch/ + +diff --git a/script/generate-txt-from-texi.sh b/script/generate-txt-from-texi.sh +index 3800c72c..ee4e8603 100755 +--- a/script/generate-txt-from-texi.sh ++++ b/script/generate-txt-from-texi.sh +@@ -822,7 +822,7 @@ function execute_commands(line, replaced_line, command) { + } else if (command == "today") { + # Make sure the date will be in english (we use "C" because it not certain + # that the English locale is enabled on the machine of the user) +- replaced_line = replaced_line "'"`LANG=C date '+%d %B %Y' | sed -e 's,^0,,' `"'"; ++ replaced_line = replaced_line "'"`LANG=C date -u -r ../../ChangeLog '+%d %B %Y' | sed -e 's,^0,,' `"'"; + + # Commands to display text in a special style ############################## + } else if (command == "asis") { diff --git a/WindowMaker.changes b/WindowMaker.changes index 54bb0f8..8d24576 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 20 12:11:03 UTC 2017 - bwiedemann@suse.com + +- Add WindowMaker-0.95.8-reproducible.patch to make build reproducible + ------------------------------------------------------------------- Tue Nov 28 20:21:32 UTC 2017 - crrodriguez@opensuse.org diff --git a/WindowMaker.spec b/WindowMaker.spec index 599eaf4..2a78e57 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -38,6 +38,8 @@ Patch2: %{name}-menu.patch Patch3: fix_wmgenmenu_paths.patch # Patch101: wm-giflib.patch +# PATCH-FEATURE-OPENSUSE +Patch102: WindowMaker-0.95.8-reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: fontconfig-devel @@ -98,6 +100,7 @@ cp %{name}/{menu.*,plmenu.*} menu_orig %patch2 %patch3 %patch101 +%patch102 -p1 cp %{S:4} . cp %{S:6} . %if 0%{?suse_version} < 1140