From e11330ae68289e96be51c413877650b3ed30a4eebdeac3f88aa6eafe1d40dba6 Mon Sep 17 00:00:00 2001 From: Mark Post Date: Tue, 10 Nov 2020 16:33:18 +0000 Subject: [PATCH] Accepting request 847053 from home:bmwiedemann:branches:Base:System Add reproducible.patch to override build date (boo#1047218) note: There is also a 4.0ga12 upstream release that might include this patch OBS-URL: https://build.opensuse.org/request/show/847053 OBS-URL: https://build.opensuse.org/package/show/Base:System/x3270?expand=0&rev=52 --- reproducible.patch | 30 ++++++++++++++++++++++++++++++ x3270.changes | 5 +++++ x3270.spec | 3 +++ 3 files changed, 38 insertions(+) create mode 100644 reproducible.patch diff --git a/reproducible.patch b/reproducible.patch new file mode 100644 index 0000000..01b0bd5 --- /dev/null +++ b/reproducible.patch @@ -0,0 +1,30 @@ +https://sourceforge.net/p/x3270/code/merge-requests/2/ + +commit f86253bc15060db29063c186b05dc9bbaa38593a +Author: Bernhard M. Wiedemann +Date: Sun Jun 18 19:49:43 2017 +0200 + + allow to override build date + + to allow reproducible builds of x3270 + + See https://reproducible-builds.org/ for why this is good + and https://reproducible-builds.org/specs/source-date-epoch/ for the definition of this variable. + + Note: this patch variant only works with GNU date + + leftover after incomplete merge in 7591b303beefed762c24386214beca432024c785 + +diff --git a/Common/mkversion.sh b/Common/mkversion.sh +index ad1c1067..4da3620a 100755 +--- a/Common/mkversion.sh ++++ b/Common/mkversion.sh +@@ -50,7 +50,7 @@ user=${LOGNAME-$USER} + # rpq.c will return this string of numbers in bcd format + # It is OK to change the length (+ or -), but use + # decimal (0-9) digits only. Length must be even number of digits. +-rpq_timestamp=`date +%Y%m%d%H%M%S` ++rpq_timestamp=`$date +%Y%m%d%H%M%S` + + app=${1-x3270} + cat < + +- Add reproducible.patch to override build date (boo#1047218) + ------------------------------------------------------------------- Fri Apr 17 18:29:55 UTC 2020 - Andreas Stieger diff --git a/x3270.spec b/x3270.spec index 915388a..8aa66d2 100644 --- a/x3270.spec +++ b/x3270.spec @@ -26,6 +26,7 @@ Summary: A Family of IBM 3270 Terminal Emulators License: MIT Group: System/X11/Terminals URL: http://x3270.bgp.nu +#Git-Clone: https://github.com/pmattes/x3270 Source0: http://download.sourceforge.net/%{name}/%{_fullname}-src.tgz Source1: http://download.sourceforge.net/%{name}/x026-%{_x026ver}.tgz Source2: x3270.desktop @@ -35,6 +36,7 @@ Patch102: x026-offset.diff Patch105: x3270-missing-include.patch Patch106: x3270-missing-file.patch Patch108: mkversion.patch +Patch109: reproducible.patch BuildRequires: bdftopcf BuildRequires: fdupes BuildRequires: fontpackages-devel @@ -108,6 +110,7 @@ x026 is a fun toy which emulates an x026 puncher. for d in x3270 c3270 s3270 tcl3270 pr3287 ; do (cd $d %patch108 -p2 +%patch109 -p2 ) done