Hello community, here is the log from the commit of package nautilus-dropbox for openSUSE:Factory checked in at 2018-03-13 10:24:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nautilus-dropbox (Old) and /work/SRC/openSUSE:Factory/.nautilus-dropbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nautilus-dropbox" Tue Mar 13 10:24:00 2018 rev:13 rq:585850 version:2015.10.28 Changes: -------- --- /work/SRC/openSUSE:Factory/nautilus-dropbox/nautilus-dropbox.changes 2018-03-08 10:57:46.524737306 +0100 +++ /work/SRC/openSUSE:Factory/.nautilus-dropbox.new/nautilus-dropbox.changes 2018-03-13 10:24:07.989567012 +0100 @@ -1,0 +2,6 @@ +Sun Mar 11 19:16:45 UTC 2018 - [email protected] + +- Add nautilus-dropbox-reproducible.patch to make man pages build + reproducibly (boo#1047218) + +------------------------------------------------------------------- New: ---- nautilus-dropbox-reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-dropbox.spec ++++++ --- /var/tmp/diff_new_pack.cC1MUV/_old 2018-03-13 10:24:08.937533048 +0100 +++ /var/tmp/diff_new_pack.cC1MUV/_new 2018-03-13 10:24:08.941532904 +0100 @@ -28,6 +28,8 @@ Source: https://www.dropbox.com/download?dl=packages/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM nautilus-dropbox-fix-crash.patch boo#900515 [email protected] -- Fix crash on startup Patch0: nautilus-dropbox-fix-crash.patch +# PATCH-FIX-UPSTREAM https://github.com/dropbox/nautilus-dropbox/pull/31 +Patch1: nautilus-dropbox-reproducible.patch BuildRequires: desktop-file-utils BuildRequires: pkgconfig BuildRequires: python-docutils @@ -67,6 +69,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure --disable-static ++++++ nautilus-dropbox-reproducible.patch ++++++ >From 218fd8c10d392aa71b38ecafb5c161d71ba43c55 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" <[email protected]> Date: Tue, 20 Jun 2017 09:30:10 +0200 Subject: [PATCH 1/2] Drop extra date from man page to allow for reproducible builds See https://reproducible-builds.org/ for why this matters. --- rst2man.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rst2man.py b/rst2man.py index 9842573..8ba185f 100644 --- a/rst2man.py +++ b/rst2man.py @@ -545,8 +545,7 @@ def depart_document(self, node): % self._docinfo['copyright']) self.body.append( self.comment( - 'Generated by docutils manpage writer on %s.\n' - % (time.strftime('%Y-%m-%d %H:%M')) ) ) + 'Generated by docutils manpage writer.\n') ) def visit_emphasis(self, node): self.body.append(self.defs['emphasis'][0]) >From 1ddc199b2002c7078f13cb9eb695fdff6dc15953 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" <[email protected]> Date: Thu, 21 Sep 2017 06:16:29 +0200 Subject: [PATCH 2/2] Allow to override build date in man page in order to make builds reproducible. 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. --- docgen.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docgen.py b/docgen.py index a2a3912..8ed9049 100644 --- a/docgen.py +++ b/docgen.py @@ -1,4 +1,6 @@ +import os import sys +import time import datetime # heeeheee @@ -17,9 +19,10 @@ formatted_commands += split[2].decode('ascii').replace('\n', '\n | ') formatted_commands += '\n\n' +date = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))).date() sys.stdout.write(sys.stdin.read().replace\ ('@AUTHORS@', authors).replace\ - ('@DATE@', datetime.date.today().isoformat()).replace\ + ('@DATE@', date.isoformat()).replace\ ('@PACKAGE_VERSION@', sys.argv[1]).replace\ ('@SYNOPSIS@', '| '+'\n| '.join(commands[cmd].__doc__.split('\n', 2)[1].decode('ascii').replace(cmd, "`%s`" % cmd).replace("dropbox", "``dropbox``") for cmd in commands)).replace\ ('@COMMANDS@', formatted_commands))
