Hello community, here is the log from the commit of package fbreader for openSUSE:Factory checked in at 2018-04-04 11:09:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fbreader (Old) and /work/SRC/openSUSE:Factory/.fbreader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fbreader" Wed Apr 4 11:09:14 2018 rev:13 rq:593340 version:0.99.4 Changes: -------- --- /work/SRC/openSUSE:Factory/fbreader/fbreader.changes 2016-07-21 08:19:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fbreader.new/fbreader.changes 2018-04-04 11:09:44.286647030 +0200 @@ -1,0 +2,6 @@ +Wed Mar 7 13:09:28 UTC 2018 - [email protected] + +- Add FBReader-0.99.4-reproducible.patch to make build reproducible + (boo#1041090) + +------------------------------------------------------------------- New: ---- FBReader-0.99.4-reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fbreader.spec ++++++ --- /var/tmp/diff_new_pack.etvnuK/_old 2018-04-04 11:09:47.326536867 +0200 +++ /var/tmp/diff_new_pack.etvnuK/_new 2018-04-04 11:09:47.326536867 +0200 @@ -33,6 +33,8 @@ # PATCH-FIX-OPENSUSE to workaround for build issue via gcc6, # see more at https://github.com/geometer/FBReader/issues/289 Patch1: fbreader-0.99.4-gcc6-Wno-narrowing.diff +# PATCH-FIX-UPSTREAM https://github.com/geometer/FBReader/pull/295 +Patch2: FBReader-0.99.4-reproducible.patch BuildRequires: expat BuildRequires: fdupes BuildRequires: gcc-c++ @@ -100,6 +102,7 @@ %if 0%{?suse_version} > 1320 %patch1 -p0 %endif +%patch2 -p1 %build make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=dummy ++++++ FBReader-0.99.4-reproducible.patch ++++++ Subject: Sort list of files to make build reproducible Author: Bernhard M. Wiedemann <bwiedemann suse de> Date: 2017-05-28 https://github.com/geometer/FBReader/pull/295 https://bugzilla.opensuse.org/show_bug.cgi?id=1041090 sort linker input files when building packages (e.g. for openSUSE Linux) (random) filesystem order of input files influences ordering of functions in the output, thus without the patch, builds (in disposable VMs) would usually differ. See https://reproducible-builds.org/ for why this matters. Setting LC_ALL is needed because locales influence how sorting happens. Index: fbreader-0.99.4/fbreader/Makefile =================================================================== --- fbreader-0.99.4.orig/fbreader/Makefile +++ fbreader-0.99.4/fbreader/Makefile @@ -22,7 +22,7 @@ all: .resources fi; \ done; @echo -n 'Linking $(TARGET) ...' - @$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 + @$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o | LC_ALL=C sort` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3 @echo ' OK' FBSHAREDIR = $(DESTDIR)$(SHAREDIR)/FBReader
