Hello community, here is the log from the commit of package otb for openSUSE:Factory checked in at 2019-11-08 15:28:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/otb (Old) and /work/SRC/openSUSE:Factory/.otb.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "otb" Fri Nov 8 15:28:39 2019 rev:2 rq:746581 version:6.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/otb/otb.changes 2019-11-07 23:15:40.696479032 +0100 +++ /work/SRC/openSUSE:Factory/.otb.new.2990/otb.changes 2019-11-08 15:28:45.171193952 +0100 @@ -1,0 +2,5 @@ +Thu Oct 31 23:14:04 UTC 2019 - Antoine Belvire <[email protected]> + +- Add otb-6.6.1-reproducible.patch: Make build more reproducible. + +------------------------------------------------------------------- New: ---- otb-6.6.1-reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ otb.spec ++++++ --- /var/tmp/diff_new_pack.MoQKAs/_old 2019-11-08 15:28:46.963195967 +0100 +++ /var/tmp/diff_new_pack.MoQKAs/_new 2019-11-08 15:28:46.967195972 +0100 @@ -38,6 +38,8 @@ Patch0: otb-fix_lib64_handling.patch # PATCH-FIX-UPSTREAM - otb-fix_VERSION_file_install.patch: fix install path of VERSION Patch1: otb-fix_VERSION_file_install.patch +# PATCH-FIX-UPSTREAM https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/merge_requests/625 +Patch2: otb-6.6.1-reproducible.patch # PATCH-FIX-OPENSUSE cmake file wants to clone the GIT repo. We are offline, so patch cmake file to be able to use our tarball instead of git clone Patch10: fix_non_git_usage.patch BuildRequires: boost-devel @@ -227,6 +229,7 @@ %setup -q -n %{tarname}-release-%{filerelease} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch10 -p0 %if %{with enable_remote_module} mv ../temporalgapfilling/ Modules/Remote/OTBTemporalGapFilling ++++++ otb-6.6.1-reproducible.patch ++++++ >From 42bac4b29633d1122d9f5ef12552583fc2a38178 Mon Sep 17 00:00:00 2001 From: Antoine Belvire <[email protected]> Date: Fri, 1 Nov 2019 00:04:17 +0100 Subject: [PATCH] Sort application names to get a sorted algs.txt Application descriptions are written for each application in OTB_APPLICATIONS_NAME_LIST. This list is unsorted, which results in descriptions written in random order in algs.txt. In order to get a deterministic output in algs.txt and thus a more reproducible build, make sure to iterate over a sorted list of application names. --- Modules/Wrappers/QGIS/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/Wrappers/QGIS/src/CMakeLists.txt b/Modules/Wrappers/QGIS/src/CMakeLists.txt index 167f57d3ed..0d2010d29d 100644 --- a/Modules/Wrappers/QGIS/src/CMakeLists.txt +++ b/Modules/Wrappers/QGIS/src/CMakeLists.txt @@ -33,6 +33,7 @@ set(app_names ${OTB_APPLICATIONS_NAME_LIST}) list(REMOVE_ITEM app_names "TestApplication") list(REMOVE_ITEM app_names "ApplicationExample") list(REMOVE_DUPLICATES app_names) +list(SORT app_names) set(dfiles) set(generate_descriptor_cmd "$<TARGET_FILE:otbQgisDescriptor>") #debian does not use RPATH and build is failing -- 2.23.0
