Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package trilinos for openSUSE:Factory checked in at 2021-02-16 22:36:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trilinos (Old) and /work/SRC/openSUSE:Factory/.trilinos.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trilinos" Tue Feb 16 22:36:49 2021 rev:11 rq:872911 version:13.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes 2020-09-15 16:15:57.813894121 +0200 +++ /work/SRC/openSUSE:Factory/.trilinos.new.28504/trilinos.changes 2021-02-16 22:45:11.726322740 +0100 @@ -1,0 +2,31 @@ +Tue Feb 16 14:41:27 UTC 2021 - Egbert Eich <[email protected]> + +- Remove /etc/ld.so.conf file that existed for non-HPC, non-MPI. + It is no longer needed $_lib/trilinos no longer exists. + +------------------------------------------------------------------- +Wed Feb 3 19:34:50 UTC 2021 - Egbert Eich <[email protected]> + +- Change 'Requires:' to other HPC packages to %requires_eq to depend + on the exact version. This should take care of HPC packages ignoring + proper ABI versioning. + +------------------------------------------------------------------- +Wed Oct 14 05:25:56 UTC 2020 - Egbert Eich <[email protected]> + +- Update to version 13.0.0 + For information on changes consult the release notes of + its sub-packages. +- Update patches: + * Replace: reproducible.patch by + Make-kokkos-build-reproducible.patch + * Remove: reproducible-docs.patch, + no longer applicable + * Remove: Fix-Makefiles-for-gmake-4.3.patch, + no longer applicable + * Remove: trilinos-11.14.3-no-return-in-non-void.patch, + int main() -> void main() conversion makes no sense. + * Add: Add-missing-ENV-DESTDIR.patch + DESTDIR isn't taken into account. + +------------------------------------------------------------------- Old: ---- Fix-Makefiles-for-gmake-4.3.patch reproducible-docs.patch reproducible.patch trilinos-11.14.3-no-return-in-non-void.patch trilinos-release-12-14-1.tar.gz New: ---- Add-missing-ENV-DESTDIR.patch Make-kokkos-build-reproducible.patch trilinos-release-13-0-0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trilinos.spec ++++++ --- /var/tmp/diff_new_pack.ryswvZ/_old 2021-02-16 22:45:13.134324592 +0100 +++ /var/tmp/diff_new_pack.ryswvZ/_new 2021-02-16 22:45:13.138324597 +0100 @@ -1,7 +1,7 @@ # # spec file for package trilinos # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,9 +22,9 @@ # Base package name %define pname trilinos -%define ver 12.14.1 -%define ver_exp 12-14-1 -%define so_ver 12 +%define ver 13.0.0 +%define ver_exp 13-0-0 +%define so_ver 13 %define PNAME %(echo %{pname} | tr [a-z] [A-Z]) %define _ver %(echo %{ver} | tr . _) %define openblas_vers 0.3.6 @@ -36,7 +36,7 @@ %if 0%{?sle_version} >= 150200 %define DisOMPI1 ExclusiveArch: do_not_build %endif -%if !%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 +%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 %define DisOMPI3 ExclusiveArch: do_not_build %endif %if 0%{?sle_version:1} && 0%{?sle_version} < 150300 @@ -400,13 +400,8 @@ Group: Productivity/Scientific/Math URL: http://trilinos.sandia.gov/index.html Source0: https://github.com/trilinos/Trilinos/archive/trilinos-release-%{ver_exp}.tar.gz -# PATCH-FIX-UPSTREAM trilinos-11.4.3-no-return-in-non-void.patch -Patch0: trilinos-11.14.3-no-return-in-non-void.patch -Patch1: Fix-Makefiles-for-gmake-4.3.patch -# PATCH-FIX-UPSTREAM -Patch2: reproducible.patch -# PATCH-FIX-UPSTREAM -Patch3: reproducible-docs.patch +Patch0: Make-kokkos-build-reproducible.patch +Patch1: Add-missing-ENV-DESTDIR.patch BuildRequires: cmake >= 2.8 BuildRequires: fdupes BuildRequires: hwloc-devel @@ -499,9 +494,9 @@ Requires: %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc # Fix this once boost is available as a HPC version #Requires: boost-%%{compiler_family}-hpc -Requires: libhdf5%{hpc_package_name_tail} >= 1.8.8 -Requires: libnetcdf%{hpc_package_name_tail} -Requires: libopenblas-%{compiler_family}-hpc +%{requires_eq libhdf5%{hpc_package_name_tail}} +%{requires_eq libnetcdf%{hpc_package_name_tail}} +%{requires_eq libopenblas-%{compiler_family}-hpc} Requires: lua-lmod >= 7.6.1 %endif @@ -548,9 +543,9 @@ # Fix this once boost is available as a HPC version #Requires: boost-%%{compiler_family}-hpc Requires: %libname = %version -Requires: hdf5%{hpc_package_name_tail}-devel -Requires: libopenblas-%{compiler_family}-hpc-devel -Requires: netcdf%{hpc_package_name_tail}-devel +%{requires_eq hdf5%{hpc_package_name_tail}-devel} +%{requires_eq libopenblas-%{compiler_family}-hpc-devel} +%{requires_eq netcdf%{hpc_package_name_tail}-devel} # hpc %endif Obsoletes: %{name} <= %version @@ -575,7 +570,6 @@ %setup -q -n Trilinos-trilinos-release-%{ver_exp} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build # https://en.opensuse.org/openSUSE:Build_system_recipes#cmake @@ -624,6 +618,7 @@ -DTrilinos_INSTALL_LIB_DIR:PATH=%{p_libdir} \ %if %{without hpc} && %{without mpi} -DTrilinos_INSTALL_INCLUDE_DIR:PATH=include/%{pname} \ + -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{p_includedir}/%{pname} \ %endif -DTrilinos_VERBOSE_CONFIGURE:BOOL=ON \ -DTrilinos_ENABLE_ALL_PACKAGES:BOOL=OFF \ @@ -756,12 +751,6 @@ depends-on %{?with_mpi:p}netcdf #depends-on boost EOF -# hpc -%else - %if %{without mpi} -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_libdir}/%{name}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf - %endif %endif # cleanup @@ -792,13 +781,10 @@ %files -n %{libname} %doc README RELEASE_NOTES %license LICENSE Copyright.txt -%dir %{p_libdir} +%{?with_hpc:%dir %{p_libdir}} %{?hpc_dirs} %{?hpc_modules_files} %{p_libdir}/*.so.* -%if %{without mpi} && %{without hpc} -%config %{_sysconfdir}/ld.so.conf.d/%{name}.conf -%endif %files devel %{p_includedir} @@ -830,7 +816,6 @@ %prep %setup -q -n Trilinos-trilinos-release-%{ver_exp} -%patch3 -p1 %build # Build the doc ++++++ Add-missing-ENV-DESTDIR.patch ++++++ From: Egbert Eich <[email protected]> Date: Wed Oct 14 00:59:53 2020 +0200 Subject: Add missing $ENV{DESTDIR} Patch-mainline: Not yet Git-commit: 3a49d9a801aff312a831d5835061d2705587264c References: Signed-off-by: Egbert Eich <[email protected]> --- .../installation/set_installed_group_and_permissions.cmake.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/tribits/core/installation/set_installed_group_and_permissions.cmake.in b/cmake/tribits/core/installation/set_installed_group_and_permissions.cmake.in index 4e54447..304065f 100644 --- a/cmake/tribits/core/installation/set_installed_group_and_permissions.cmake.in +++ b/cmake/tribits/core/installation/set_installed_group_and_permissions.cmake.in @@ -59,7 +59,7 @@ ENDFUNCTION() # Executable script # -IF (EXISTS "${projectInstallBaseDir}") +IF (EXISTS "$ENV{DESTDIR}${projectInstallBaseDir}") EXECUTE_PROCESS(COMMAND whoami OUTPUT_STRIP_TRAILING_WHITESPACE @@ -80,10 +80,10 @@ IF (EXISTS "${projectInstallBaseDir}") SET(CMAKE_INSTALL_PREFIX "${dirPath}") ELSE() # Non-recursive set of the group and permissions - SET_DIR_OWNER_AND_PERMS("${dirPath}" "") + SET_DIR_OWNER_AND_PERMS("$ENV{DESTDIR}${dirPath}" "") FOREACH(subDirEle ${projectSubdirPathsArrayLessOne}) SET(dirPath "${dirPath}/${subDirEle}") - SET_DIR_OWNER_AND_PERMS("${dirPath}" "") + SET_DIR_OWNER_AND_PERMS("$ENV{DESTDIR}${dirPath}" "") ENDFOREACH() # Append last subdir which gives CMAKE_INSTALL_PREFIX LIST(GET projectSubdirPathsArray -1 lastSubdir) @@ -91,7 +91,7 @@ IF (EXISTS "${projectInstallBaseDir}") ENDIF() # Recursive set of group and permsisions on CMAKE_INSTALL_PREFIX - SET_DIR_OWNER_AND_PERMS("${CMAKE_INSTALL_PREFIX}" "-R") + SET_DIR_OWNER_AND_PERMS("$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}" "-R") ELSE() ++++++ Make-kokkos-build-reproducible.patch ++++++ From: Egbert Eich <[email protected]> Date: Wed Oct 14 07:25:08 2020 +0200 Subject: Make kokkos build reproducible Patch-mainline: Not yet Git-commit: dae04f951684ece236b948050b57b2fca0d0c4bd References: Signed-off-by: Egbert Eich <[email protected]> --- packages/kokkos/Makefile.kokkos | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/kokkos/Makefile.kokkos b/packages/kokkos/Makefile.kokkos index 320d398..12f570b 100644 --- a/packages/kokkos/Makefile.kokkos +++ b/packages/kokkos/Makefile.kokkos @@ -448,9 +448,14 @@ kokkos_append_header = $(shell echo $1 >> $(KOKKOS_INTERNAL_CONFIG_TMP)) # Do not append first line tmp := $(shell echo "/* ---------------------------------------------" > KokkosCore_config.tmp) tmp := $(call kokkos_append_header,"Makefile constructed configuration:") -tmp := $(call kokkos_append_header,"$(shell date)") -tmp := $(call kokkos_append_header,"----------------------------------------------*/") +tmp := $(call kokkos_append_header,"----------------------------------------------*/") +ifdef SOURCE_DATE_EPOCH + BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" 2>/dev/null || date -u) +else + BUILD_DATE ?= $(shell date) +endif +tmp := $(call kokkos_append_header,"$(BUILD_DATE)") tmp := $(call kokkos_append_header,'\#if !defined(KOKKOS_MACROS_HPP) || defined(KOKKOS_CORE_CONFIG_H)') tmp := $(call kokkos_append_header,'\#error "Do not include $(KOKKOS_CONFIG_HEADER) directly; include Kokkos_Macros.hpp instead."') tmp := $(call kokkos_append_header,'\#else') ++++++ trilinos-release-12-14-1.tar.gz -> trilinos-release-13-0-0.tar.gz ++++++ /work/SRC/openSUSE:Factory/trilinos/trilinos-release-12-14-1.tar.gz /work/SRC/openSUSE:Factory/.trilinos.new.28504/trilinos-release-13-0-0.tar.gz differ: char 13, line 1
