Hello community, here is the log from the commit of package petsc for openSUSE:Leap:15.2 checked in at 2020-05-07 19:26:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/petsc (Old) and /work/SRC/openSUSE:Leap:15.2/.petsc.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "petsc" Thu May 7 19:26:53 2020 rev:53 rq:757686 version:3.12.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/petsc/petsc.changes 2020-01-15 15:43:42.659264187 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.petsc.new.2738/petsc.changes 2020-05-07 19:32:03.978057367 +0200 @@ -1,0 +2,80 @@ +Wed Dec 11 17:31:03 UTC 2019 - Egbert Eich <e...@suse.com> + +- Remove unneeded dependency from HPC devel package. + +------------------------------------------------------------------- +Tue Dec 3 08:31:20 UTC 2019 - Egbert Eich <e...@suse.com> + +- Update to version 3.12.2 (jsc#SLE-8505) + * https://www.mcs.anl.gov/petsc/documentation/changes/312.html +- Remove petsc-3.3-p2-fix-shared-libs-sonames.patch + link created directly in %install section +- Remove petsc-3.3-p2-dont-check-for-option-mistakes.patch + not needed. +- Remove petsc-3.3-fix-error-detection-in-makefile.patch + not needed. +- Add non-HPC build with openmpi3 +- Add HPC builds for gcc8 & gcc 9 (jsc#SLE-7766 & jsc#SLE-8604). +- Disable openmpi1 builds for SLE/Leap > 15.1. +- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). + +------------------------------------------------------------------- +Wed Nov 27 16:38:25 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Reflect renaming of openmpi packages to openmpi1 in Tumbleweed, + fixes unresolvable packages. +- Fix copy'n'paste error, mpi_vers vs. mpi_ver +- Add non-HPC openmpi2 flavor. + +------------------------------------------------------------------- +Wed Aug 21 08:20:23 UTC 2019 - Ana Guerrero Lopez <aguerr...@suse.com> + +- Update to version 3.11.3 (jsc#SLE-8505) + - https://www.mcs.anl.gov/petsc/documentation/changes/311.html + - Binaries have changed path from bin/ to lib/petsc/bin/ +- Patches removed, merged by upstream + * Python-Fix-a-number-of-scripts-to-by-Python-3-compliant.patch + * petsc-fix-nonmpi.patch +- Patches refreshed + * petsc-3.3-p2-fix-shared-libs-sonames.patch + * petsc-3.3-p2-no-rpath.patch + * petsc-3.3-p2-dont-check-for-option-mistakes.patch + * petsc-3.3-fix-error-detection-in-makefile.patch + * petsc-3.7-fix-pastix-detection.patch +- Set -fPIC also on x86_64 + +------------------------------------------------------------------- +Fri Jul 19 16:15:44 UTC 2019 - Egbert Eich <e...@suse.com> + +- Upped memory constraints to 6G for non-ppc systems as well, + leaving the special ppc treatment in place in case we need to up it + some more there. + +------------------------------------------------------------------- +Wed Jul 17 06:07:56 UTC 2019 - Michel Normand <norm...@linux.vnet.ibm.com> + +- update _constraints for PowerPC more than 4G memory +- Add BuildRequires libopenblas-gnu-hpc >= 0.3.6 for hpc to avoid + to build when openblas library not available. + +------------------------------------------------------------------- +Tue Mar 26 15:29:56 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Disable pastix also in openmpi flavor, same as for serial and HPC flavors. + Pastix is only built with openmpi, and not available in Factory. + +------------------------------------------------------------------- +Wed Mar 20 18:15:58 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix building non-MPI flavors of packages depending on petsc + Add petsc-fix-nonmpi.patch +- Do not move headers to /usr/include and symlink, causes problems with + -isystem + +------------------------------------------------------------------- +Wed Mar 13 23:34:19 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix spec for non-HPC, reenable serial and non-HPC openmpi build. +- Disable HYPRE for non-HPC, same as for HPC. + +------------------------------------------------------------------- Old: ---- Python-Fix-a-number-of-scripts-to-by-Python-3-compliant.patch petsc-3.3-fix-error-detection-in-makefile.patch petsc-3.3-p2-dont-check-for-option-mistakes.patch petsc-3.3-p2-fix-shared-libs-sonames.patch petsc-3.8.3.tar.gz New: ---- petsc-3.12.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ petsc.spec ++++++ --- /var/tmp/diff_new_pack.H0Nw2i/_old 2020-05-07 19:32:05.314060041 +0200 +++ /var/tmp/diff_new_pack.H0Nw2i/_new 2020-05-07 19:32:05.314060041 +0200 @@ -1,7 +1,7 @@ # # spec file for package petsc # -# 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 @@ -19,20 +19,26 @@ %global flavor @BUILD_FLAVOR@%{nil} %define pname petsc -%define vers 3.8.3 -%define _vers 3_8_3 +%define vers 3.12.2 +%define _vers 3_12_2 %define so_ver 3 +%define openblas_vers 0.3.6 ExcludeArch: s390 s390x -%if 0%{?is_opensuse} || 0%{?is_backports} -%undefine DisOMPI3 -%else +# Fails to link during configure, as it omits SuperLU from the link libraries +%bcond_with hypre +# Only available as openmpi flavor, and not in Factory +%bcond_with pastix + +%if 0%{?sle_version} >= 150200 +%define DisOMPI1 ExclusiveArch: do_not_build +%endif +%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 %define DisOMPI3 ExclusiveArch: do_not_build %endif %if "%flavor" == "" -%dfine package_name %pname ExclusiveArch: do_not_build %endif @@ -47,17 +53,26 @@ %endif %if "%flavor" == "openmpi" +%{?DisOMPI1} %define mpi_family openmpi %define mpi_vers 1 %{bcond_with hpc} %endif %if "%flavor" == "openmpi2" +%{?DisOMPI2} %define mpi_family openmpi %define mpi_vers 2 %{bcond_with hpc} %endif +%if "%flavor" == "openmpi3" +%{?DisOMPI3} +%define mpi_family openmpi +%define mpi_vers 3 +%{bcond_with hpc} +%endif + %if "%flavor" == "mvapich2" %define mpi_family mvapich2 %{bcond_with hpc} @@ -72,21 +87,21 @@ %{bcond_without hpc} %endif -%if "%flavor" == "gnu-openmpi3-hpc" -%{?DisOMPI3} +%if "%flavor" == "gnu-openmpi2-hpc" +%{?DisOMPI2} %define mpi_family openmpi %define compiler_family gnu %undefine c_f_ver -%define mpi_vers 3 +%define mpi_vers 2 %{bcond_without hpc} %endif -%if "%flavor" == "gnu-openmpi2-hpc" -%{?DisOMPI2} +%if "%flavor" == "gnu-openmpi3-hpc" +%{?DisOMPI3} %define mpi_family openmpi %define compiler_family gnu %undefine c_f_ver -%define mpi_vers 2 +%define mpi_vers 3 %{bcond_without hpc} %endif @@ -113,6 +128,15 @@ %{bcond_without hpc} %endif +%if "%flavor" == "gnu7-openmpi2-hpc" +%{?DisOMPI2} +%define mpi_family openmpi +%define compiler_family gnu +%define c_f_ver 7 +%define mpi_vers 2 +%{bcond_without hpc} +%endif + %if "%flavor" == "gnu7-openmpi3-hpc" %{?DisOMPI3} %define mpi_family openmpi @@ -135,24 +159,104 @@ %define c_f_ver 7 %{bcond_without hpc} %endif +# +%if "%flavor" == "gnu8-openmpi-hpc" +%{?DisOMPI1} +%define mpi_family openmpi +%define compiler_family gnu +%define c_f_ver 8 +%define mpi_vers 1 +%{bcond_without hpc} +%endif + +%if "%flavor" == "gnu8-openmpi2-hpc" +%{?DisOMPI2} +%define mpi_family openmpi +%define compiler_family gnu +%define c_f_ver 8 +%define mpi_vers 2 +%{bcond_without hpc} +%endif + +%if "%flavor" == "gnu8-openmpi3-hpc" +%{?DisOMPI3} +%define mpi_family openmpi +%define compiler_family gnu +%define c_f_ver 8 +%define mpi_vers 3 +%{bcond_without hpc} +%endif + +%if "%flavor" == "gnu8-mvapich2-hpc" +%define mpi_family mvapich2 +%define compiler_family gnu +%define c_f_ver 8 +%{bcond_without hpc} +%endif + +%if "%flavor" == "gnu8-mpich-hpc" +%define mpi_family mpich +%define compiler_family gnu +%define c_f_ver 8 +%{bcond_without hpc} +%endif +# +%if "%flavor" == "gnu9-openmpi-hpc" +%{?DisOMPI1} +%define mpi_family openmpi +%define compiler_family gnu +%define c_f_ver 9 +%define mpi_vers 1 +%{bcond_without hpc} +%endif + +%if "%flavor" == "gnu9-openmpi2-hpc" +%{?DisOMPI2} +%define mpi_family openmpi +%define compiler_family gnu +%define c_f_ver 9 +%define mpi_vers 2 +%{bcond_without hpc} +%endif + +%if "%flavor" == "gnu9-openmpi3-hpc" +%{?DisOMPI3} +%define mpi_family openmpi +%define compiler_family gnu +%define c_f_ver 9 +%define mpi_vers 3 +%{bcond_without hpc} +%endif + +%if "%flavor" == "gnu9-mvapich2-hpc" +%define mpi_family mvapich2 +%define compiler_family gnu +%define c_f_ver 9 +%{bcond_without hpc} +%endif + +%if "%flavor" == "gnu9-mpich-hpc" +%define mpi_family mpich +%define compiler_family gnu +%define c_f_ver 9 +%{bcond_without hpc} +%endif %if !0%{?is_opensuse} && !0%{?with_hpc:1} ExclusiveArch: do_not_build %endif +# openmpi 1 was called just "openmpi" in Leap 15.x/SLE15 +%if 0%{?suse_version} >= 1550 || "%{mpi_family}" != "openmpi" || "%{mpi_vers}" != "1" +%define mpi_ext %{?mpi_vers} +%endif + %if %{without hpc} -%if 0%{!?package_name:1} %define package_name() %{pname}%{?with_mpi:-%{mpi_family}%{?mpi_ext}} -%endif %define libname() lib%{pname}%{so_ver}%{?with_mpi:-%{mpi_family}%{?mpi_ext}} %else %{hpc_init -c %compiler_family -m %mpi_family %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}} -# For compatibility package names -%if "%{mpi_family}" != "openmpi" || "%{mpi_ver}" != "1" -%define mpi_ext %{?mpi_ver} -%endif - %define package_name() %{hpc_package_name %_vers} %define libname() lib%{pname}%{expand:%%{hpc_package_name_tail %{**}}} %global libname_plain %{libname} @@ -179,7 +283,7 @@ %endif %define p_libdir %{p_base}%_lib -%define p_include %{p_base}include +%define p_include %{p_prefix}/include %define petsc_arch linux-gnu-c-opt @@ -191,13 +295,9 @@ Release: 0 Source: ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz -Patch0: petsc-3.3-p2-fix-shared-libs-sonames.patch -Patch1: petsc-3.3-p2-no-rpath.patch -Patch2: petsc-3.3-p2-dont-check-for-option-mistakes.patch -Patch3: petsc-3.3-fix-error-detection-in-makefile.patch -Patch4: petsc-3.7-fix-pastix-detection.patch -Patch5: Python-Fix-a-number-of-scripts-to-by-Python-3-compliant.patch -Url: http://www.mcs.anl.gov/petsc/ +Patch0: petsc-3.3-p2-no-rpath.patch +Patch1: petsc-3.7-fix-pastix-detection.patch +URL: https://www.mcs.anl.gov/petsc/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{!?makedoc:1} BuildRequires: fdupes @@ -214,24 +314,32 @@ BuildRequires: gcc-c++ BuildRequires: gcc-fortran BuildRequires: lapack-devel -BuildRequires: metis-devel BuildRequires: suitesparse-devel %if %{with mpi} BuildRequires: %{mpi_family}%{?mpi_ext}-devel BuildRequires: blacs-%{mpi_family}%{?mpi_ext}-devel BuildRequires: hdf5-%{mpi_family}%{?mpi_ext}-devel +%if %{with hypre} BuildRequires: hypre-%{mpi_family}%{?mpi_ext}-devel -BuildRequires: libptscotch-%{mpi_family}%{?mpi_ext}-devel -BuildRequires: libptscotch-parmetis-%{mpi_family}%{?mpi_ext}-devel +BuildRequires: superlu-devel +%endif +BuildRequires: ptscotch-%{mpi_family}%{?mpi_ext}-devel +BuildRequires: ptscotch-parmetis-%{mpi_family}%{?mpi_ext}-devel +#!BuildIgnore: metis-devel +%if %{with pastix} BuildRequires: pastix-%{mpi_family}%{?mpi_ext}-devel +%endif BuildRequires: scalapack-%{mpi_family}%{?mpi_ext}-devel + %else +BuildRequires: metis-devel %endif %else BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel BuildRequires: %{mpi_family}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel BuildRequires: hdf5%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-%{mpi_family}%{?mpi_vers}-hpc-devel BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel +BuildRequires: libopenblas-%{compiler_family}-hpc >= %{openblas_vers} BuildRequires: libscalapack2%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-%{mpi_family}%{?mpi_vers}-hpc-devel BuildRequires: lua-lmod BuildRequires: suse-hpc @@ -266,20 +374,22 @@ %package %{?n_pre}devel Summary: Devel files for petsc Group: Development/Libraries/C and C++ -Requires: %{libname} = %{version} +Requires: %{libname %_vers} = %{version} %if %{without hpc} Requires: Modules Requires: suitesparse-devel %if %{without mpi} Requires: metis-devel %else -Requires: %{libname %_vers} = %{version} Requires: blacs-%{mpi_family}%{?mpi_ext}-devel Requires: hdf5-%{mpi_family}%{?mpi_ext}-devel Requires: hypre-%{mpi_family}%{?mpi_ext}-devel -Requires: libptscotch-%{mpi_family}%{?mpi_ext}-devel -Requires: libptscotch-parmetis-%{mpi_family}%{?mpi_ext}-devel +Requires: ptscotch-%{mpi_family}%{?mpi_ext}-devel +Requires: ptscotch-parmetis-%{mpi_family}%{?mpi_ext}-devel Requires: scalapack-%{mpi_family}%{?mpi_ext}-devel + %if "%{mpi_family}%{?mpi_ext}" == "openmpi1" +Provides: %{pname}-openmpi-devel + %endif %endif %else # with hpc Requires: %{libname %_vers} = %{version} @@ -320,12 +430,8 @@ %prep %setup -q -n petsc-%{version} -%patch0 -p1 -b .soname -%patch1 -p1 -b .rpath -%patch2 -p1 -b .option-mistakes -%patch3 -p1 -b .error-detect -%patch4 -p1 -b .pastix-detect -%patch5 -p1 +%patch0 -p1 -b .rpath +%patch1 -p1 -b .pastix-detect %if 0%{?makedoc:1} %files doc @@ -353,7 +459,7 @@ %hpc_setup module load phdf5 scalapack openblas %endif -%ifarch ppc64le ppc64 s390 aarch64 +%ifarch ppc64le ppc64 s390 aarch64 x86_64 export ARCHCFLAGS=-fPIC %endif @@ -379,22 +485,27 @@ --with-mpi=1 \ --with-mpi-dir=%{p_base}\ --with-blacs=1 \ - --with-blacs-include=%{p_include} \ + --with-blacs-include=%{p_base}/include \ --with-blacs-lib=[%{p_libdir}/libblacs.so] \ + %if %{with pastix} --with-pastix=1 \ --with-pastix-pkg-config=%{p_libdir}/pkgconfig \ + %endif --with-ptscotch=1 \ - --with-ptscotch-include=%{p_include} \ + --with-ptscotch-include=%{p_base}/include \ --with-ptscotch-lib=[%{p_libdir}/libptscotch.so,%{p_libdir}/libptscotcherr.so,%{p_libdir}/libptscotcherrexit.so,%{p_libdir}/libptscotchparmetis.so] \ --with-scalapack=1 \ - --with-scalapack-include=%{p_include} \ + --with-scalapack-include=%{p_base}/include \ --with-scalapack-lib=[%{p_libdir}/libscalapack.so] \ + %if %{with hypre} + --with-superlu=1 \ --with-hypre=1 \ - --with-hypre-include=%{p_include}/hypre \ + --with-hypre-include=%{p_base}/include/hypre \ --with-hypre-lib=%{p_libdir}/libHYPRE.so \ + %endif --with-hdf5=1 \ --with-hdf5-lib=%{p_libdir}/libhdf5.so \ - --with-hdf5-include=%{p_include} + --with-hdf5-include=%{p_base}/include %endif %else # with hpc --with-blas-lapack-lib=$OPENBLAS_LIB/libopenblas.so \ @@ -413,15 +524,20 @@ export PETSC_ARCH=%petsc_arch %endif -make install DESTDIR=%{buildroot}%p_prefix +make install DESTDIR=%{buildroot} + rm -f %{buildroot}%{p_prefix}/share/petsc/examples/src/*/examples/*/output/*.out +rm -f %{buildroot}%{p_prefix}/share/petsc/examples/src/*/examples/*/*/output/*.out rm -f %{buildroot}%{p_prefix}/share/petsc/examples/src/*/*/examples/*/output/*.out +rm -f %{buildroot}%{p_prefix}/share/petsc/examples/src/*/*/examples/*/*/output/*.out rm -f %{buildroot}%{p_prefix}/share/petsc/examples/src/*/*/*/examples/*/output/*.out +rm -f %{buildroot}%{p_prefix}/share/petsc/examples/src/*/*/*/examples/*/*/output/*.out rm -f %{buildroot}%{p_prefix}/lib/petsc/conf/*.log rm -f %{buildroot}%{p_prefix}/lib/petsc/conf/.DIR pushd %{buildroot}%{p_prefix}/lib ln -sf libpetsc.so.%{version} libpetsc.so +ln -sf libpetsc.so.%{version} libpetsc.so.%{so_ver} popd %if %{without hpc} @@ -431,10 +547,6 @@ rm -rf %{buildroot}%{p_prefix}/lib/petsc/conf/*.py rm -rf %{buildroot}%{p_prefix}/lib/petsc/conf/modules -# move include dirs outside ptesc dir -mv %{buildroot}%{p_prefix}/include %{buildroot}%{p_base}/ -ln -s %{p_include} %{buildroot}%{p_prefix}/include - # create symlink for libs between %%libdir and petscdir pushd %{buildroot}%{p_libdir} for f in petsc/%{version}/%petsc_arch/lib/*.so*; do @@ -478,21 +590,15 @@ rm -f %{buildroot}%{p_prefix}/$i done -for file in %{hpc_bindir}/parseargs.py \ - %{hpc_bindir}/petsc_conf.py \ - %{hpc_bindir}/PetscBinaryIO.py \ - %{hpc_bindir}/PetscBinaryIOTrajectory.py +for file in %{hpc_prefix}/lib/petsc/bin/petsc_conf.py \ + %{hpc_prefix}/lib/petsc/bin/PetscBinaryIO.py \ + %{hpc_prefix}/lib/petsc/bin/PetscBinaryIOTrajectory.py do %{hpc_python_mv_to_sitearch $file} done -rm -rf %{buildroot}/%{hpc_bindir}/win32fe -rm -f %{buildroot}/%{hpc_bindir}/uncrustify.cfg \ - %{buildroot}/%{hpc_bindir}/sendToJenkins \ - %{buildroot}/%{hpc_libdir}/rules -%{hpc_shebang_prepend_list %{buildroot}%{hpc_bindir}/*.py} - -%hpc_shebang_sanitize_scripts %{buildroot}%{p_prefix}/bin +%{hpc_shebang_prepend_list %{buildroot}%{p_prefix}/lib/petsc/bin/*.py} +%hpc_shebang_sanitize_scripts %{buildroot}%{p_prefix}/lib/petsc/bin %hpc_shebang_sanitize_scripts %{buildroot}%{p_prefix}/lib/petsc tmp=$(mktemp /tmp/bad-XXXXXX}) @@ -502,7 +608,7 @@ [ -s $tmp ] && { echo "One or more python script not Python 3 compliant!"; cat $tmp; exit 1; } rm -f $tmp -pyton_sitesearch_path=%{hpc_python_sitearch_no_singlespec} +#pyton_sitesearch_path=%{hpc_python_sitearch_no_singlespec} %hpc_write_modules_files #%%Module1.0##################################################################### @@ -538,15 +644,15 @@ } } -prepend-path PATH %{hpc_bindir} +prepend-path PATH %{hpc_prefix}/lib/petsc/bin prepend-path LD_LIBRARY_PATH %{hpc_libdir} if {[file isdirectory $pyton_sitesearch_path]} { prepend-path PYTHONPATH $pyton_sitesearch_path } setenv %{hpc_upcase %pname}_DIR %{hpc_prefix} -if {[file isdirectory %{hpc_bindir}]} { -setenv %{hpc_upcase %pname}_BIN %{hpc_bindir} +if {[file isdirectory %{hpc_prefix}/lib/petsc/bin]} { +setenv %{hpc_upcase %pname}_BIN %{hpc_prefix}/lib/petsc/bin } if {[file isdirectory %{hpc_includedir}]} { prepend-path LIBRARY_PATH %{hpc_libdir} @@ -585,6 +691,7 @@ done %fdupes %{buildroot}%{p_include} +%fdupes %{buildroot}%{p_libdir} ## %post -n %{libname %_vers} -p /sbin/ldconfig @@ -594,44 +701,40 @@ %{?with_hpc:%{hpc_module_delete_if_default}} %files -n %{libname %_vers} -%defattr(-,root,root,-) %doc docs/manual.pdf -%if %{without hpc} + %if %{without hpc} %dir %{p_libdir}/petsc %dir %{p_libdir}/petsc/%{version} -%else + %else %hpc_dirs %hpc_modules_files -%endif # with hpc +%{dirname:%{hpc_python_sitearch_no_singlespec}} + %endif # with hpc %dir %{p_prefix} %dir %{p_prefix}/lib %{p_libdir}/*.so.* %{!?with_hpc:%{p_prefix}/lib/*.so.*} %{p_prefix}/share -%{dirname:%{hpc_python_sitearch_no_singlespec}} %exclude %{p_prefix}/share/petsc/examples %exclude %{p_prefix}/share/petsc/saws %files %{?n_pre}devel -%defattr(-,root,root,-) -%{p_prefix}/bin -%exclude %{p_prefix}/bin/saws +%{p_prefix}/lib/petsc/bin/ +%exclude %{p_prefix}/lib/petsc/bin/saws %{p_prefix}/include %{p_prefix}/lib/petsc %{p_prefix}/%{!?with_hpc:lib}%{?with_hpc:%_lib}/pkgconfig -%{p_include}/* %{p_libdir}/*.so -%if %{without hpc} + %if %{without hpc} %{p_prefix}/lib/*.so %dir %{_datadir}/modules/%{name}-%{petsc_arch} %{_datadir}/modules/%{name}-%{petsc_arch}/%version%{?with_mpi:-%{mpi_family}%{?mpi_ext}} -%endif + %endif %{p_prefix}/share/petsc/examples %if %{with hpc} %files saws -%defattr(-,root,root,-) -%{p_prefix}/bin/saws +%{p_prefix}/lib/petsc/bin/saws %{p_prefix}/share/petsc/saws %endif ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.H0Nw2i/_old 2020-05-07 19:32:05.338060088 +0200 +++ /var/tmp/diff_new_pack.H0Nw2i/_new 2020-05-07 19:32:05.338060088 +0200 @@ -2,7 +2,18 @@ <constraints> <hardware> <memory> - <size unit="G">4</size> + <size unit="G">6</size> </memory> </hardware> + <overwrite> + <conditions> + <arch>ppc64</arch> + <arch>ppc64le</arch> + </conditions> + <hardware> + <memory> + <size unit="G">6</size> + </memory> + </hardware> + </overwrite> </constraints> ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.H0Nw2i/_old 2020-05-07 19:32:05.354060120 +0200 +++ /var/tmp/diff_new_pack.H0Nw2i/_new 2020-05-07 19:32:05.358060128 +0200 @@ -1,7 +1,9 @@ <multibuild> <package>doc</package> - <!-- <package>serial</package> --> - <!-- <package>openmpi</package> --> + <package>serial</package> + <package>openmpi</package> + <package>openmpi2</package> + <package>openmpi3</package> <package>gnu-openmpi-hpc</package> <package>gnu-openmpi2-hpc</package> <package>gnu-openmpi3-hpc</package> ++++++ petsc-3.8.3.tar.gz -> petsc-3.12.2.tar.gz ++++++ /work/SRC/openSUSE:Leap:15.2/petsc/petsc-3.8.3.tar.gz /work/SRC/openSUSE:Leap:15.2/.petsc.new.2738/petsc-3.12.2.tar.gz differ: char 5, line 1 ++++++ petsc-3.3-p2-no-rpath.patch ++++++ --- /var/tmp/diff_new_pack.H0Nw2i/_old 2020-05-07 19:32:05.382060177 +0200 +++ /var/tmp/diff_new_pack.H0Nw2i/_new 2020-05-07 19:32:05.382060177 +0200 @@ -4,7 +4,7 @@ --- a/config/BuildSystem/config/setCompilers.py +++ b/config/BuildSystem/config/setCompilers.py -@@ -1384,9 +1384,9 @@ class Configure(config.base.Configure): +@@ -1443,9 +1443,9 @@ class Configure(config.base.Configure): self.pushLanguage(language) # test '-R' before '-rpath' as sun compilers [c,fortran] don't give proper errors with wrong options. if not Configure.isDarwin(self.log): ++++++ petsc-3.7-fix-pastix-detection.patch ++++++ --- /var/tmp/diff_new_pack.H0Nw2i/_old 2020-05-07 19:32:05.390060192 +0200 +++ /var/tmp/diff_new_pack.H0Nw2i/_new 2020-05-07 19:32:05.390060192 +0200 @@ -9,7 +9,7 @@ --- a/config/BuildSystem/config/package.py +++ b/config/BuildSystem/config/package.py -@@ -139,7 +139,10 @@ class Package(config.base.Configure): +@@ -153,7 +153,10 @@ class Package(config.base.Configure): self.PACKAGE = self.name.upper() self.package = self.name.lower() self.downloadname = self.name
