Hello community, here is the log from the commit of package trilinos for openSUSE:Leap:15.2 checked in at 2020-05-13 13:47:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/trilinos (Old) and /work/SRC/openSUSE:Leap:15.2/.trilinos.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trilinos" Wed May 13 13:47:10 2020 rev:4 rq:803507 version:12.14.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/trilinos/trilinos.changes 2020-05-07 19:30:49.553908435 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.trilinos.new.2738/trilinos.changes 2020-05-13 13:47:13.097292567 +0200 @@ -1,0 +2,53 @@ +Thu May 7 18:51:54 UTC 2020 - Egbert Eich <[email protected]> + +- Again try to fix up dependencies after removing the + base package. +- Let (non-HPC) trilinos-devel conflict with kokkos-devel + +------------------------------------------------------------------- +Tue May 5 12:11:46 UTC 2020 - Egbert Eich <[email protected]> + +- Fix dependencies for devel package after eliminating the + base package: + * Remove dependency to base package + * for HPC add dependency to library package + +------------------------------------------------------------------- +Thu Apr 30 04:43:33 UTC 2020 - Egbert Eich <[email protected]> + +- Don't use ninja as cmake generator for Leap/SLE < 15.2 + as it doesn't support fortran. + +------------------------------------------------------------------- +Mon Apr 27 04:57:53 UTC 2020 - Egbert Eich <[email protected]> + +- Eliminate trilinos base package, move %doc and %license files + to the lib-package and remaining binary files to the devel-package. + +------------------------------------------------------------------- +Sun Apr 26 19:10:18 UTC 2020 - Egbert Eich <[email protected]> + +- Fix build for gmake 4.3 in a backward compatible way (boo#1170523), + Fix-Makefiles-for-gmake-4.3.patch was added. + +------------------------------------------------------------------- +Fri Apr 24 13:12:14 UTC 2020 - Christoph Junghans <[email protected]> + +- nvcc_wrapper is a compiler wrapper and should go in -devel + package +- fix "extra tokens" RPM build errors + +------------------------------------------------------------------- +Fri Apr 10 06:46:37 UTC 2020 - Oliver Kurz <[email protected]> + +- Use ninja as cmake builder for potential speedup + +------------------------------------------------------------------- +Thu Dec 12 22:42:46 UTC 2019 - Stefan Brüns <[email protected]> + +- Replace open coded job limit (<= 4) by macro from memory-constraints +- Remove physicalmemory _constraints +- Reduce _constraints for documentation packages. +- Fix openmpi(1) builds for Leap/SLE <= 15.1 + +------------------------------------------------------------------- New: ---- Fix-Makefiles-for-gmake-4.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trilinos.spec ++++++ --- /var/tmp/diff_new_pack.oPxLaq/_old 2020-05-13 13:47:16.733300393 +0200 +++ /var/tmp/diff_new_pack.oPxLaq/_new 2020-05-13 13:47:16.737300402 +0200 @@ -1,7 +1,7 @@ # # spec file for package trilinos # -# Copyright (c) 2019 SUSE LLC +# 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 @@ -261,16 +261,11 @@ ExclusiveArch: do_not_build %endif -# OBS workaround: limit the number of parallel processes to 4 on 8G RAM (see _constraints) -%if %(echo %{?_smp_mflags} | sed -e "s/.*-j\([[:digit:]]\+\).*/\\1/") > 4 -%global _smp_mflags %(echo %{?_smp_mflags} | sed -e "s/\\(.*-j\\)[[:digit:]]\\+\\(.*\\)/\\14\\2/") -%endif - %{?mpi_family:%{bcond_without mpi}}%{!?mpi_family:%{bcond_with mpi}} %{?with_mpi:%{!?mpi_family:error "No MPI family specified!"}} # For compatibility package names -%if "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1" +%if "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1" || 0%{?suse_version} >= 1550 %define mpi_ext %{?mpi_ver} %endif @@ -310,16 +305,21 @@ 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 BuildRequires: cmake >= 2.8 BuildRequires: fdupes BuildRequires: hwloc-devel +%if 0%{?sle_version} > 150100 || 0%{?suse_version} > 1500 +BuildRequires: ninja +%endif %if %{with qt} BuildRequires: libqt4-devel %endif +BuildRequires: memory-constraints BuildRequires: swig > 2.0.0 BuildRequires: xz BuildRequires: zlib-devel -%{?with_hpc:BuildRequires: suse-hpc} +%{?with_hpc:BuildRequires: suse-hpc >= 0.5} %if %{with doc} BuildRequires: doxygen @@ -339,10 +339,8 @@ BuildRequires: libopenblas-%{compiler_family}-hpc >= %{openblas_vers} BuildRequires: libopenblas-%{compiler_family}-hpc-devel BuildRequires: netcdf-%{compiler_family}-%{mpi_family}%{?mpi_ext}-hpc-devel -#Requires: %libname = %version -%hpc_requires -%hpc_requires_devel - %else # hpc +# hpc + %else BuildRequires: boost-devel BuildRequires: cppunit-devel BuildRequires: gcc-c++ @@ -367,12 +365,14 @@ BuildRequires: ptscotch-%{mpi_family}%{?mpi_ext}-devel BuildRequires: scalapack-%{mpi_family}%{?mpi_ext}-devel %endif - %endif # hpc +# hpc + %endif # FIXME: Serial package is currently not pulling in library Requires: %libname = %version -%endif # doc +# doc +%endif %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} @@ -393,6 +393,7 @@ # only used for HPC Group: System/Libraries %if %{with hpc} +%hpc_requires Requires: %{compiler_family}%{?c_f_ver}-compilers-hpc Requires: %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc # Fix this once boost is available as a HPC version @@ -415,7 +416,6 @@ %package devel Summary: Headers and development files for %{package_name} Group: Development/Libraries/C and C++ -Requires: %name = %version %if %{without hpc} Requires: glpk-devel Requires: swig @@ -429,6 +429,7 @@ Requires: scotch-devel Requires: suitesparse-common-devel Requires: umfpack-devel +Conflicts: kokkos-devel %else Requires: blacs-devel-headers Requires: hdf5-%{mpi_family}%{?mpi_ext}-devel @@ -438,16 +439,20 @@ Requires: ptscotch-%{mpi_family}%{?mpi_ext}-devel Requires: scalapack-%{mpi_family}%{?mpi_ext}-devel %endif -%else # hpc +# hpc +%else +%hpc_requires_devel Requires: %{compiler_family}%{?c_f_ver}-compilers-hpc 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: %libname = %version Requires: hdf5%{hpc_package_name_tail}-devel Requires: libopenblas-%{compiler_family}-hpc-devel Requires: netcdf%{hpc_package_name_tail}-devel -#Requires: %libname = %version -%endif # hpc +# hpc +%endif +Obsoletes: %{name} <= %version %description devel Trilinos is a collection of compatible software packages that support parallel @@ -461,17 +466,21 @@ %if %{with hpc} -%{hpc_master_package -L} %{hpc_master_package -l -L} -%{hpc_master_package -L devel} - +%{hpc_master_package -L -O %{pname}%{hpc_package_name_tail} devel} %endif %prep %setup -q -n Trilinos-trilinos-release-%{ver_exp} %patch0 -p1 +%patch1 -p1 %build +# https://en.opensuse.org/openSUSE:Build_system_recipes#cmake +%if 0%{?sle_version} > 150100 || 0%{?suse_version} > 1500 +%define __builder ninja +%endif +%limit_build -m 4000 # Fix this once boost is available as a HPC version # move this to the non-hpc section BOOST_INC=%{_incdir}/boost @@ -598,7 +607,7 @@ %install %{?with_hpc:%hpc_setup} %{?with_hpc:%hpc_setup_mpi} -%cmake_install INSTALL='install -p' +%cmake_install %if %{with hpc} %hpc_write_modules_files @@ -642,7 +651,8 @@ depends-on %{?with_mpi:p}netcdf #depends-on boost EOF -%else # hpc +# hpc +%else %if %{without mpi} mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/%{name}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf @@ -674,14 +684,11 @@ %hpc_module_delete_if_default %endif -%files -%{?hpc_dirs} +%files -n %{libname} %doc README RELEASE_NOTES %license LICENSE Copyright.txt -%{p_bindir}%{!?hpc:/*} - -%files -n %{libname} %dir %{p_libdir} +%{?hpc_dirs} %{?hpc_modules_files} %{p_libdir}/*.so.* %if %{without mpi} && %{without hpc} @@ -692,7 +699,9 @@ %{p_includedir} %{p_libdir}/cmake %{p_libdir}/*.so -%endif # doc +%{p_bindir}%{!?hpc:/*} +# doc +%endif ############################################################################# # Build documentation only @@ -742,6 +751,7 @@ %files doc %doc doc/* -%endif # doc +# doc +%endif %changelog ++++++ Fix-Makefiles-for-gmake-4.3.patch ++++++ ++++ 734 lines (skipped) ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.oPxLaq/_old 2020-05-13 13:47:16.781300497 +0200 +++ /var/tmp/diff_new_pack.oPxLaq/_new 2020-05-13 13:47:16.785300505 +0200 @@ -6,18 +6,19 @@ <memory> <size unit="G">9</size> </memory> - <physicalmemory> - <size unit="G">7</size> - </physicalmemory> </hardware> <overwrite> <conditions> - <arch>ppc64</arch> + <package>trilinos:documentation</package> + <package>trilinos:documentation-hpc</package> </conditions> <hardware> <disk> - <size unit="G">22</size> + <size unit="G">8</size> </disk> + <memory> + <size unit="G">2</size> + </memory> </hardware> </overwrite> </constraints>
