commit trilinos for openSUSE:Factory
Hello community, here is the log from the commit of package trilinos for openSUSE:Factory checked in at 2020-09-15 16:15:57 Comparing /work/SRC/openSUSE:Factory/trilinos (Old) and /work/SRC/openSUSE:Factory/.trilinos.new.4249 (New) Package is "trilinos" Tue Sep 15 16:15:57 2020 rev:10 rq:834000 version:12.14.1 Changes: --- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes2020-05-11 13:34:44.900286778 +0200 +++ /work/SRC/openSUSE:Factory/.trilinos.new.4249/trilinos.changes 2020-09-15 16:15:57.813894121 +0200 @@ -1,0 +2,22 @@ +Fri Sep 11 06:22:46 UTC 2020 - Egbert Eich + +- Add build support for gcc10 to HPC build (bsc#1174439). +- Add openmpi4 flavors. +- Revert: Use memoryperjob constraint instead of %limit_build macro. + This would attempt to find a work whose memory matches the number + of jobs available * memoryperjob. Such workers may not exist. +- Use 'module load netcdf' - this is now the load command for + all variants of netcdf. + +--- +Thu Aug 20 09:08:15 UTC 2020 - Martin Liška + +- Use memoryperjob constraint instead of %limit_build macro. + +--- +Tue Aug 11 18:16:44 UTC 2020 - Bernhard Wiedemann + +- Add reproducible.patch to override build date (boo#1047218) +- Add reproducible-docs.patch to sort the file list (boo#1041090) + +--- New: reproducible-docs.patch reproducible.patch Other differences: -- ++ trilinos.spec ++ --- /var/tmp/diff_new_pack.on4lEu/_old 2020-09-15 16:15:59.021895240 +0200 +++ /var/tmp/diff_new_pack.on4lEu/_new 2020-09-15 16:15:59.025895244 +0200 @@ -39,6 +39,9 @@ %if !%{?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 +%define DisOMPI4 ExclusiveArch: do_not_build +%endif %if "%flavor" == "" ExclusiveArch: do_not_build @@ -81,6 +84,14 @@ %{bcond_with hpc} %endif +%if "%{flavor}" == "openmpi4" +%{?DisOMPI4} +%undefine c_f_ver +%global mpi_family openmpi +%define mpi_ver 4 +%{bcond_with hpc} +%endif + %if "%{flavor}" == "gnu-mvapich2-hpc" %undefine c_f_ver %global mpi_family mvapich2 @@ -122,6 +133,15 @@ %{bcond_without hpc} %endif +%if "%{flavor}" == "gnu-openmpi4-hpc" +%{?DisOMPI4} +%undefine c_f_ver +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 4 +%{bcond_without hpc} +%endif + %if "%{flavor}" == "gnu7-mvapich2-hpc" %define c_f_ver 7 %global mpi_family mvapich2 @@ -163,6 +183,15 @@ %{bcond_without hpc} %endif +%if "%{flavor}" == "gnu7-openmpi4-hpc" +%{?DisOMPI4} +%define c_f_ver 7 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 4 +%{bcond_without hpc} +%endif + %if "%{flavor}" == "gnu8-mvapich2-hpc" %define c_f_ver 8 %global mpi_family mvapich2 @@ -204,6 +233,15 @@ %{bcond_without hpc} %endif +%if "%{flavor}" == "gnu8-openmpi4-hpc" +%{?DisOMPI4} +%define c_f_ver 8 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 4 +%{bcond_without hpc} +%endif + %if "%{flavor}" == "gnu9-mvapich2-hpc" %define c_f_ver 9 %global mpi_family mvapich2 @@ -245,6 +283,65 @@ %{bcond_without hpc} %endif +%if "%{flavor}" == "gnu9-openmpi4-hpc" +%{?DisOMPI4} +%define c_f_ver 9 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 4 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu10-mvapich2-hpc" +%define c_f_ver 10 +%global mpi_family mvapich2 +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu10-mpich-hpc" +%define c_f_ver 10 +%global mpi_family mpich +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu10-openmpi-hpc" +%{?DisOMPI1} +%define c_f_ver 10 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 1 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu10-openmpi2-hpc" +%{?DisOMPI2} +%define c_f_ver 10 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 2 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu10-openmpi3-hpc" +%{?DisOMPI3} +%define c_f_ver 10 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 3 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu10-openmpi4-hpc" +%{?DisOMPI4} +%define c_f_ver 10 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 4 +%{bcond_without hpc} +%endif + %if "%{flavor}" == "documentation-hpc" %{bcond_without hpc} %{bcond_without doc} @@ -306,6 +403,10 @@ # PATCH-FIX-UPSTREAM trilinos-11.4.3-no-return-in-non-void.patch Patch0: trilin
commit trilinos for openSUSE:Factory
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.changes2020-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 + +- 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 + +- 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 + +- 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 + +- 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 + +- 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 + +- 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 + +- 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:
commit trilinos for openSUSE:Factory
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.changes2019-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 + +- 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 @@ 9 - - 7 - - ppc64 + trilinos:documentation + trilinos:documentation-hpc -22 +8 + +2 +
commit trilinos for openSUSE:Factory
Hello community, here is the log from the commit of package trilinos for openSUSE:Factory checked in at 2019-12-12 23:18:15 Comparing /work/SRC/openSUSE:Factory/trilinos (Old) and /work/SRC/openSUSE:Factory/.trilinos.new.4691 (New) Package is "trilinos" Thu Dec 12 23:18:15 2019 rev:7 rq:755674 version:12.14.1 Changes: --- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes2019-12-05 17:34:01.925450786 +0100 +++ /work/SRC/openSUSE:Factory/.trilinos.new.4691/trilinos.changes 2019-12-12 23:18:28.934211765 +0100 @@ -6 +6 @@ - jsc#SLE-8609). + jsc#SLE-8604). Other differences: --
commit trilinos for openSUSE:Factory
Hello community, here is the log from the commit of package trilinos for openSUSE:Factory checked in at 2019-12-05 17:33:56 Comparing /work/SRC/openSUSE:Factory/trilinos (Old) and /work/SRC/openSUSE:Factory/.trilinos.new.4691 (New) Package is "trilinos" Thu Dec 5 17:33:56 2019 rev:6 rq:753922 version:12.14.1 Changes: --- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes2019-10-30 14:42:38.965852494 +0100 +++ /work/SRC/openSUSE:Factory/.trilinos.new.4691/trilinos.changes 2019-12-05 17:34:01.925450786 +0100 @@ -1,0 +2,13 @@ +Tue Dec 3 10:12:12 UTC 2019 - Egbert Eich + +- Add support for gcc8 builds for HPC. +- Add support for gcc8 and gcc9 builds for HPC (jsc#SLE-7766, + jsc#SLE-8609). + +--- +Thu Nov 28 16:20:55 UTC 2019 - Egbert Eich + +- Disable openmpi1 builds for SLE/Leap > 15.1. +- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). + +--- Other differences: -- ++ trilinos.spec ++ --- /var/tmp/diff_new_pack.vXqLLv/_old 2019-12-05 17:34:03.225450602 +0100 +++ /var/tmp/diff_new_pack.vXqLLv/_new 2019-12-05 17:34:03.229450601 +0100 @@ -1,7 +1,7 @@ # # spec file for package trilinos # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,13 +33,10 @@ # - some modules require pointers of bigger size ExcludeArch:i586 s390 s390x ppc armv7l -%if 0%{?is_opensuse} || 0%{?is_backports} -%undefine DisOMPI1 -%undefine DisOMPI2 -%undefine DisOMPI3 -%else +%if 0%{?sle_version} >= 150200 %define DisOMPI1 ExclusiveArch: do_not_build -%undefine DisOMPI2 +%endif +%if !%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 %define DisOMPI3 ExclusiveArch: do_not_build %endif @@ -61,6 +58,7 @@ %endif %if "%{flavor}" == "openmpi" +%{?DisOMPI1} %undefine c_f_ver %global mpi_family openmpi %define mpi_ver 1 @@ -68,6 +66,7 @@ %endif %if "%{flavor}" == "openmpi2" +%{?DisOMPI2} %undefine c_f_ver %global mpi_family openmpi %define mpi_ver 2 @@ -75,6 +74,7 @@ %endif %if "%{flavor}" == "openmpi3" +%{?DisOMPI3} %undefine c_f_ver %global mpi_family openmpi %define mpi_ver 3 @@ -122,6 +122,129 @@ %{bcond_without hpc} %endif +%if "%{flavor}" == "gnu7-mvapich2-hpc" +%define c_f_ver 7 +%global mpi_family mvapich2 +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu7-mpich-hpc" +%define c_f_ver 7 +%global mpi_family mpich +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu7-openmpi-hpc" +%{?DisOMPI1} +%define c_f_ver 7 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 1 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu7-openmpi2-hpc" +%{?DisOMPI2} +%define c_f_ver 7 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 2 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu7-openmpi3-hpc" +%{?DisOMPI3} +%define c_f_ver 7 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 3 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu8-mvapich2-hpc" +%define c_f_ver 8 +%global mpi_family mvapich2 +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu8-mpich-hpc" +%define c_f_ver 8 +%global mpi_family mpich +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu8-openmpi-hpc" +%{?DisOMPI1} +%define c_f_ver 8 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 1 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu8-openmpi2-hpc" +%{?DisOMPI2} +%define c_f_ver 8 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 2 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu8-openmpi3-hpc" +%{?DisOMPI3} +%define c_f_ver 8 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 3 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu9-mvapich2-hpc" +%define c_f_ver 9 +%global mpi_family mvapich2 +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu9-mpich-hpc" +%define c_f_ver 9 +%global mpi_family mpich +%global compiler_family gnu +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu9-openmpi-hpc" +%{?DisOMPI1} +%define c_f_ver 9 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 1 +%{bcond_without hpc} +%endif + +%if "%{flavor}" == "gnu9-openmpi2-hpc" +%{?DisOMPI2} +%define c_f_ver 9 +%global mpi_family openmpi +%global compiler_family gnu +%define mpi_ver 2 +
commit trilinos for openSUSE:Factory
Hello community, here is the log from the commit of package trilinos for openSUSE:Factory checked in at 2019-10-30 14:42:35 Comparing /work/SRC/openSUSE:Factory/trilinos (Old) and /work/SRC/openSUSE:Factory/.trilinos.new.2990 (New) Package is "trilinos" Wed Oct 30 14:42:35 2019 rev:5 rq:734755 version:12.14.1 Changes: --- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes2019-10-02 11:58:06.955151601 +0200 +++ /work/SRC/openSUSE:Factory/.trilinos.new.2990/trilinos.changes 2019-10-30 14:42:38.965852494 +0100 @@ -1,0 +2,6 @@ +Thu Oct 3 04:22:38 UTC 2019 - Michel Normand + +- update _constraints for ppc64 for 22GB disk + to avoid out of disk space build error. + +--- Other differences: -- ++ _constraints ++ --- /var/tmp/diff_new_pack.tPy8BF/_old 2019-10-30 14:42:41.081854747 +0100 +++ /var/tmp/diff_new_pack.tPy8BF/_new 2019-10-30 14:42:41.085854752 +0100 @@ -10,4 +10,14 @@ 7 + + + ppc64 + + + +22 + + +
commit trilinos for openSUSE:Factory
Hello community, here is the log from the commit of package trilinos for openSUSE:Factory checked in at 2019-10-02 11:58:05 Comparing /work/SRC/openSUSE:Factory/trilinos (Old) and /work/SRC/openSUSE:Factory/.trilinos.new.2352 (New) Package is "trilinos" Wed Oct 2 11:58:05 2019 rev:4 rq:734096 version:12.14.1 Changes: --- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes2019-09-07 11:48:36.938315047 +0200 +++ /work/SRC/openSUSE:Factory/.trilinos.new.2352/trilinos.changes 2019-10-02 11:58:06.955151601 +0200 @@ -4,3 +4,3 @@ -- Update to version 12.14.1. Trilinos is composed of 60 different - packages. To see the changes you need to check the release notes of - every package under packages/ +- Update to version 12.14.1. (jsc#SLE-8513) + Trilinos is composed of 60 different packages. To see the changes + you need to check the release notes of every package under packages/ Other differences: --
commit trilinos for openSUSE:Factory
Hello community, here is the log from the commit of package trilinos for openSUSE:Factory checked in at 2019-09-07 11:48:11 Comparing /work/SRC/openSUSE:Factory/trilinos (Old) and /work/SRC/openSUSE:Factory/.trilinos.new.7948 (New) Package is "trilinos" Sat Sep 7 11:48:11 2019 rev:3 rq:727689 version:12.14.1 Changes: --- /work/SRC/openSUSE:Factory/trilinos/trilinos.changes2019-07-18 15:22:20.860123421 +0200 +++ /work/SRC/openSUSE:Factory/.trilinos.new.7948/trilinos.changes 2019-09-07 11:48:36.938315047 +0200 @@ -1,0 +2,9 @@ +Wed Aug 28 12:41:02 UTC 2019 - Ana Guerrero Lopez + +- Update to version 12.14.1. Trilinos is composed of 60 different + packages. To see the changes you need to check the release notes of + every package under packages/ +- Remove patches, upstream has fixed this problem in a different way + * Trilinos-trilinos-aarch64.patch + +--- Old: Trilinos-trilinos-aarch64.patch trilinos-release-12-10-1.tar.gz New: trilinos-release-12-14-1.tar.gz Other differences: -- ++ trilinos.spec ++ --- /var/tmp/diff_new_pack.HgLegg/_old 2019-09-07 11:48:39.466314689 +0200 +++ /var/tmp/diff_new_pack.HgLegg/_new 2019-09-07 11:48:39.470314688 +0200 @@ -22,8 +22,8 @@ # Base package name %define pname trilinos -%define ver 12.10.1 -%define ver_exp 12-10-1 +%define ver 12.14.1 +%define ver_exp 12-14-1 %define so_ver 12 %define PNAME %(echo %{pname} | tr [a-z] [A-Z]) %define _ver %(echo %{ver} | tr . _) @@ -187,7 +187,6 @@ 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: Trilinos-trilinos-aarch64.patch BuildRequires: cmake >= 2.8 BuildRequires: fdupes BuildRequires: hwloc-devel @@ -348,7 +347,6 @@ %prep %setup -q -n Trilinos-trilinos-release-%{ver_exp} %patch0 -p1 -%patch1 -p1 %build # Fix this once boost is available as a HPC version ++ trilinos-release-12-10-1.tar.gz -> trilinos-release-12-14-1.tar.gz ++ /work/SRC/openSUSE:Factory/trilinos/trilinos-release-12-10-1.tar.gz /work/SRC/openSUSE:Factory/.trilinos.new.7948/trilinos-release-12-14-1.tar.gz differ: char 13, line 1