Hello community, here is the log from the commit of package ocr.12111 for openSUSE:Leap:15.1:Update checked in at 2020-03-25 10:18:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.1:Update/ocr.12111 (Old) and /work/SRC/openSUSE:Leap:15.1:Update/.ocr.12111.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocr.12111" Wed Mar 25 10:18:49 2020 rev:1 rq:786160 version:1.0.1 Changes: -------- New Changes file: --- /dev/null 2020-03-10 18:28:06.918142398 +0100 +++ /work/SRC/openSUSE:Leap:15.1:Update/.ocr.12111.new.3160/ocr.changes 2020-03-25 10:18:50.323388102 +0100 @@ -0,0 +1,70 @@ +------------------------------------------------------------------- +Thu Mar 5 16:36:49 UTC 2020 - Egbert Eich <e...@suse.com> + +- Disable openmpi1 builds for SLE/Leap > 15.1. +- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). + +------------------------------------------------------------------- +Mon Feb 18 17:18:02 UTC 2019 - Egbert Eich <e...@suse.com> + +- Add ORC_BIN to environment variable with module file (bsc#1125822). + +------------------------------------------------------------------- +Fri Feb 15 19:47:30 UTC 2019 - Bernhard Wiedemann <bwiedem...@suse.com> + +- 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 <e...@suse.com> + +- Remove suse-hpc as requires (should be buildrequires only) + (bsc#676571). + +------------------------------------------------------------------- +Mon Feb 11 22:18:49 UTC 2019 - Egbert Eich <e...@suse.com> + +- Fix HPC modulefile: + * libraries are always there when module file is installed, + * prepend CPATH, C_INCLUDE_PATH, CPLUS_INCLUDE_PATH elements. +- Fix package groups. + +------------------------------------------------------------------- +Fri Feb 8 15:47:58 UTC 2019 - Antoine Ginies <agin...@suse.com> + +- Add a sub example package to test in a production environement + +------------------------------------------------------------------- +Fri Feb 8 15:22:26 UTC 2019 - e...@suse.com + +- Set default module version correctly when installing the + master package, unset when deinstalling the default library + package. +- Split of documentation. +- Some sanitization. + +------------------------------------------------------------------- +Fri Feb 8 14:35:37 UTC 2019 - Antoine Ginies <agin...@suse.com> + +- fix typo in mpi_vers (2) + +------------------------------------------------------------------- +Wed Feb 6 09:14:03 UTC 2019 - e...@suse.com + +- Fix a requires for MPI: since the version was missing it failed + for openmpi (bsc#1124444). + +------------------------------------------------------------------- +Mon Jan 28 11:46:51 UTC 2019 - e...@suse.com + +- Disable openmpi1 and openmpi3 for SLE builds. + +------------------------------------------------------------------- +Sun Jan 27 16:51:21 UTC 2019 - Jan Engelhardt <jeng...@inai.de> + +- Trim empty phrases from description. + +------------------------------------------------------------------- +Fri Jan 5 14:59:20 UTC 2018 - cg...@suse.com + +- inital commit of ocr version 1.0.1 (FATE#324154) New: ---- OCRv1.0.1.tbz2 _multibuild ocr.changes ocr.spec reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocr.spec ++++++ # # spec file for package ocr # # Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via https://bugs.opensuse.org/ # %global flavor @BUILD_FLAVOR@%{nil} # Base package name %define pname ocr %define PNAME %(echo %{pname} | tr [a-z] [A-Z]) %define _ver 1_0_1 %if 0%{?sle_version} >= 150200 %define DisOMPI1 ExclusiveArch: do_not_build %endif %if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 %define DisOMPI3 ExclusiveArch: do_not_build %endif # Build options %if "%flavor" == "" %define package_name %{pname} ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu-hpc" %define compiler_family gnu %undefine c_f_ver %bcond_with mpi %endif %if "%{flavor}" == "gnu-mvapich2-hpc" %define compiler_family gnu %undefine c_f_ver %global mpi_family mvapich2 %bcond_without mpi %endif %if "%{flavor}" == "gnu-mpich-hpc" %define compiler_family gnu %undefine c_f_ver %global mpi_family mpich %bcond_without mpi %endif %if "%{flavor}" == "gnu-openmpi-hpc" %define compiler_family gnu %undefine c_f_ver %global mpi_family openmpi %define mpi_vers 1 %bcond_without mpi %{?DisOMPI1} %endif %if "%{flavor}" == "gnu-openmpi2-hpc" %define compiler_family gnu %undefine c_f_ver %global mpi_family openmpi %define mpi_vers 2 %bcond_without mpi %{?DisOMPI2} %endif %if "%{flavor}" == "gnu-openmpi3-hpc" %define compiler_family gnu %undefine c_f_ver %global mpi_family openmpi %define mpi_vers 3 %bcond_without mpi %{?DisOMPI3} %endif %{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 Summary: Open Community Runtime (OCR) for shared memory License: BSD-3-Clause Group: Productivity/Clustering/Computing URL: https://xstack.exascale-tech.com/wiki # The Wiki/git-repo/download site for the source code at Exascale # 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 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 Requires: %{mpi_family}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc %endif %hpc_requires %description The Open Community Runtime project is an application building framework that explores methods for high-core-count programming with focus on HPC applications. %package -n %{hpc_package_name %_ver}-devel Summary: Headers and development files for the Open Community Runtime Group: Development/Libraries/Parallel Requires: %{hpc_package_name %_ver} %hpc_requires_devel %description -n %{hpc_package_name %_ver}-devel The Open Community Runtime project is an application building framework that explores methods for high-core-count programming with focus on HPC applications. OCR headers and libraries files needed for development. %package doc Summary: Documentation for %{package_name} Group: Documentation/Other %description doc The Open Community Runtime project is an application building framework that explores methods for high-core-count programming with focus on HPC applications. Documentation for ocr packages. %package examples Summary: Examples for %{package_name} Group: Documentation/Other Recommends: %{package_name} %description examples The Open Community Runtime project is an application building framework that explores methods for high-core-count programming with focus on HPC applications. Examples for ocr packages. %{hpc_master_package -L} %{hpc_master_package -L devel} %{hpc_master_package doc} %{hpc_master_package -L examples} %prep %setup -q -n ocr-OCRv%{version} %patch0 -p1 %build cd ocr/build %hpc_setup OCR_TYPE=x86 make %{?_smp_mflags} all %if %{with mpi} OCR_TYPE=x86-mpi make %{?_smp_mflags} all %endif %install mv ocr/tests examples find ./examples -type f -a -name ".*" -delete %fdupes -s examples cd ocr/build %hpc_setup mkdir -p %{buildroot}/%{hpc_prefix} make OCR_TYPE=x86 OCR_INSTALL=%{buildroot}/%{hpc_prefix} %{?_smp_mflags} install %if %{with mpi} make OCR_TYPE=x86-mpi OCR_INSTALL=%{buildroot}/%{hpc_prefix} %{?_smp_mflags} install %endif %if "%{hpc_prefix}/lib" != "%{hpc_libdir}" mv %{buildroot}/%{hpc_prefix}/lib %{buildroot}/%{hpc_libdir} %endif cd %{buildroot}/%{hpc_prefix}/config/ ln -s default.cfg generated.cfg cd - # Remove static libraries find "%buildroot" -type f "(" -name "*.a" -o -name "*.la" ")" -delete # Add the spec %{hpc_write_pkgconfig} %hpc_write_modules_files #%%Module1.0##################################################################### proc ModulesHelp { } { puts stderr " " puts stderr "This module loads the %{PNAME} library built with the %{compiler_family} compiler toolchain %{?with_mpi: using %{mpi_family}%{?mpi_vers}} for shared memory" puts stderr "\nVersion %{version}\n" } module-whatis "Name: %{PNAME} for shared memory built with %{compiler_family} toolchain%{?with_mpi: using %{mpi_family}%{?mpi_vers}}" module-whatis "Version: %{version}" module-whatis "Category: runtime library" module-whatis "Description: %{SUMMARY}" module-whatis "%{url}" set version %{version} prepend-path PATH %{hpc_bindir} if {[file isdirectory %{hpc_includedir}]} { prepend-path INCLUDE %{hpc_includedir} } 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} prepend-path CPATH %{hpc_includedir} prepend-path C_INCLUDE_PATH %{hpc_includedir} prepend-path CPLUS_INCLUDE_PATH %{hpc_includedir} %hpc_modulefile_add_pkgconfig_path } setenv OCR_INSTALL %{hpc_prefix} setenv OCR_TYPE x86 EOF %fdupes -s %{buildroot} %postun %hpc_module_delete_if_default %files %license ocr/LICENSE %hpc_modules_files %{hpc_dirs} %dir %hpc_bindir %hpc_libdir/*.so %hpc_pkgconfig_file %hpc_bindir/ocrrun %hpc_prefix/config %files devel %license ocr/LICENSE %{hpc_includedir} %files doc %doc ocr/spec/ocr-1.0.1.pdf %files examples %license ocr/LICENSE %doc examples %changelog ++++++ _multibuild ++++++ <multibuild> <package>gnu-openmpi-hpc</package> <package>gnu-openmpi2-hpc</package> <package>gnu-openmpi3-hpc</package> <package>gnu-mvapich2-hpc</package> <package>gnu-mpich-hpc</package> <package>gnu-hpc</package> </multibuild> ++++++ 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