Hello community, here is the log from the commit of package ocr for openSUSE:Factory checked in at 2019-02-25 17:53:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocr (Old) and /work/SRC/openSUSE:Factory/.ocr.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocr" Mon Feb 25 17:53:27 2019 rev:2 rq:678159 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ocr/ocr.changes 2019-02-14 14:36:32.727566020 +0100 +++ /work/SRC/openSUSE:Factory/.ocr.new.28833/ocr.changes 2019-02-25 17:53:28.902526480 +0100 @@ -1,0 +2,17 @@ +Mon Feb 18 17:18:02 UTC 2019 - Egbert Eich <[email protected]> + +- Add ORC_BIN to environment variable with module file (bsc#1125822). + +------------------------------------------------------------------- +Fri Feb 15 19:47:30 UTC 2019 - Bernhard Wiedemann <[email protected]> + +- Add reproducible.patch to sort input file list + to make the build reproducible (boo#1041090) + +------------------------------------------------------------------- +Fri Feb 15 14:54:51 UTC 2019 - Egbert Eich <[email protected]> + +- Remove suse-hpc as requires (should be buildrequires only) + (bsc#676571). + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocr.spec ++++++ --- /var/tmp/diff_new_pack.MjqKPJ/_old 2019-02-25 17:53:29.906526015 +0100 +++ /var/tmp/diff_new_pack.MjqKPJ/_new 2019-02-25 17:53:29.906526015 +0100 @@ -1,7 +1,7 @@ # # spec file for package ocr # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -90,7 +90,6 @@ %{hpc_init -c %compiler_family %{?c_f_ver:-v %{c_f_ver}} %{?with_mpi:-m {%mpi_family}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}} %{?hpc_package_name:%define package_name %{hpc_package_name %_ver}} - Name: %package_name Version: 1.0.1 Release: 0 @@ -102,9 +101,9 @@ # seems to have issues. Let's hope these are temporary. # Source0: https://xstack.exascale-tech.com/git/public/snapshots/ocr-refs/tags/OCRv%%{version}.tbz2 Source0: OCRv%{version}.tbz2 -Requires: suse-hpc -BuildRequires: fdupes +Patch0: reproducible.patch BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel +BuildRequires: fdupes BuildRequires: suse-hpc %if %{with mpi} BuildRequires: %{mpi_family}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel @@ -161,6 +160,7 @@ %prep %setup -q -n ocr-OCRv%{version} +%patch0 -p1 %build cd ocr/build @@ -219,6 +219,7 @@ prepend-path LD_LIBRARY_PATH %{hpc_libdir} setenv %{PNAME}_DIR %{hpc_prefix} +setenv %{PNAME}_BIN %{hpc_bindir} setenv %{PNAME}_LIB %{hpc_libdir} if {[file isdirectory %{hpc_includedir}]} { setenv %{PNAME}_INC %{hpc_includedir} ++++++ reproducible.patch ++++++ Author: Bernhard M. Wiedemann <bwiedemann suse de> Date: 2019-02-15 Sort input file list so that libocr.so builds in a reproducible way in spite of indeterministic filesystem readdir order. See https://reproducible-builds.org/ for why this is good. diff --git a/ocr/build/common.mk b/ocr/build/common.mk index aa8d333..7b39f17 100644 --- a/ocr/build/common.mk +++ b/ocr/build/common.mk @@ -213,7 +213,7 @@ CFLAGS := -g -Wall $(CFLAGS) $(CFLAGS_USER) # # Generate a list of all source files and the respective objects # -SRCS := $(shell find -L $(OCR_ROOT)/src -name '*.[csS]' -print) +SRCS := $(sort $(shell find -L $(OCR_ROOT)/src -name '*.[csS]' -print)) # # Generate a source search path
