Hello community, here is the log from the commit of package trilinos for openSUSE:Factory checked in at 2020-02-03 11:14:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trilinos (Old) and /work/SRC/openSUSE:Factory/.trilinos.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trilinos" Mon Feb 3 11:14:32 2020 rev:8 rq:769279 version:12.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes 2019-12-12 23:18:28.934211765 +0100 +++ /work/SRC/openSUSE:Factory/.trilinos.new.26092/trilinos.changes 2020-02-03 11:14:36.473884040 +0100 @@ -1,0 +2,8 @@ +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 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trilinos.spec ++++++ --- /var/tmp/diff_new_pack.NAnprU/_old 2020-02-03 11:14:38.137884880 +0100 +++ /var/tmp/diff_new_pack.NAnprU/_new 2020-02-03 11:14:38.137884880 +0100 @@ -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 @@ -316,6 +311,7 @@ %if %{with qt} BuildRequires: libqt4-devel %endif +BuildRequires: memory-constraints BuildRequires: swig > 2.0.0 BuildRequires: xz BuildRequires: zlib-devel @@ -472,6 +468,7 @@ %patch0 -p1 %build +%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 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.NAnprU/_old 2020-02-03 11:14:38.169884897 +0100 +++ /var/tmp/diff_new_pack.NAnprU/_new 2020-02-03 11:14:38.173884899 +0100 @@ -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>
