Hello community, here is the log from the commit of package trilinos for openSUSE:Factory checked in at 2020-05-11 13:32:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trilinos (Old) and /work/SRC/openSUSE:Factory/.trilinos.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trilinos" Mon May 11 13:32:12 2020 rev:9 rq:802594 version:12.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes 2020-02-03 11:14:36.473884040 +0100 +++ /work/SRC/openSUSE:Factory/.trilinos.new.2738/trilinos.changes 2020-05-11 13:34:44.900286778 +0200 @@ -1,0 +2,45 @@ +Thu May 7 18:51:54 UTC 2020 - Egbert Eich <e...@suse.com> + +- 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 <e...@suse.com> + +- 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 <e...@suse.com> + +- 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 <e...@suse.com> + +- 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 <e...@suse.com> + +- 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 <jungh...@votca.org> + +- 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 <ok...@suse.com> + +- Use ninja as cmake builder for potential speedup + +------------------------------------------------------------------- New: ---- Fix-Makefiles-for-gmake-4.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trilinos.spec ++++++ --- /var/tmp/diff_new_pack.4tPS8V/_old 2020-05-11 13:34:47.292291793 +0200 +++ /var/tmp/diff_new_pack.4tPS8V/_new 2020-05-11 13:34:47.292291793 +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 @@ -305,9 +305,13 @@ 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 @@ -315,7 +319,7 @@ 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 @@ -335,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++ @@ -363,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))")} @@ -389,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 @@ -411,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 @@ -425,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 @@ -434,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 @@ -457,17 +466,20 @@ %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 @@ -595,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 @@ -639,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 @@ -671,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} @@ -689,7 +699,9 @@ %{p_includedir} %{p_libdir}/cmake %{p_libdir}/*.so -%endif # doc +%{p_bindir}%{!?hpc:/*} +# doc +%endif ############################################################################# # Build documentation only @@ -739,6 +751,7 @@ %files doc %doc doc/* -%endif # doc +# doc +%endif %changelog ++++++ Fix-Makefiles-for-gmake-4.3.patch ++++++ ++++ 734 lines (skipped)
