Hello community, here is the log from the commit of package petsc for openSUSE:Factory checked in at 2019-08-28 16:03:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/petsc (Old) and /work/SRC/openSUSE:Factory/.petsc.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "petsc" Wed Aug 28 16:03:31 2019 rev:16 rq:725362 version:3.11.3 Changes: -------- --- /work/SRC/openSUSE:Factory/petsc/petsc.changes 2019-07-21 11:35:00.712770096 +0200 +++ /work/SRC/openSUSE:Factory/.petsc.new.7948/petsc.changes 2019-08-28 16:03:41.518780569 +0200 @@ -1,0 +2,17 @@ +Wed Aug 21 08:20:23 UTC 2019 - Ana Guerrero Lopez <[email protected]> + +- Update to version 3.11.3 + - 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 + +------------------------------------------------------------------- Old: ---- Python-Fix-a-number-of-scripts-to-by-Python-3-compliant.patch petsc-3.8.3.tar.gz petsc-fix-nonmpi.patch New: ---- petsc-3.11.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ petsc.spec ++++++ --- /var/tmp/diff_new_pack.GAFVZR/_old 2019-08-28 16:03:43.970780200 +0200 +++ /var/tmp/diff_new_pack.GAFVZR/_new 2019-08-28 16:03:43.970780200 +0200 @@ -19,8 +19,8 @@ %global flavor @BUILD_FLAVOR@%{nil} %define pname petsc -%define vers 3.8.3 -%define _vers 3_8_3 +%define vers 3.11.3 +%define _vers 3_11_3 %define so_ver 3 %define openblas_vers 0.3.6 @@ -38,7 +38,6 @@ %endif %if "%flavor" == "" -%dfine package_name %pname ExclusiveArch: do_not_build %endif @@ -202,10 +201,7 @@ 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 -# PATCH-FIX-UPSTREAM [rebased] -- Fix building non-MPI flavors of packages depending on petsc -Patch6: petsc-fix-nonmpi.patch -Url: http://www.mcs.anl.gov/petsc/ +Url: https://www.mcs.anl.gov/petsc/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{!?makedoc:1} BuildRequires: fdupes @@ -341,8 +337,6 @@ %patch2 -p1 -b .option-mistakes %patch3 -p1 -b .error-detect %patch4 -p1 -b .pastix-detect -%patch5 -p1 -%patch6 -p1 %if 0%{?makedoc:1} %files doc @@ -370,7 +364,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 @@ -435,10 +429,14 @@ 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 @@ -496,21 +494,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}) @@ -520,7 +512,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##################################################################### @@ -556,15 +548,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} @@ -613,14 +605,14 @@ %files -n %{libname %_vers} %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 %{dirname:%{hpc_python_sitearch_no_singlespec}} -%endif # with hpc + %endif # with hpc %dir %{p_prefix} %dir %{p_prefix}/lib %{p_libdir}/*.so.* @@ -630,23 +622,22 @@ %exclude %{p_prefix}/share/petsc/saws %files %{?n_pre}devel -%{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 -%{p_prefix}/bin/saws +%{p_prefix}/lib/petsc/bin/saws %{p_prefix}/share/petsc/saws %endif ++++++ petsc-3.8.3.tar.gz -> petsc-3.11.3.tar.gz ++++++ /work/SRC/openSUSE:Factory/petsc/petsc-3.8.3.tar.gz /work/SRC/openSUSE:Factory/.petsc.new.7948/petsc-3.11.3.tar.gz differ: char 5, line 1 ++++++ petsc-3.3-fix-error-detection-in-makefile.patch ++++++ --- /var/tmp/diff_new_pack.GAFVZR/_old 2019-08-28 16:03:44.022780192 +0200 +++ /var/tmp/diff_new_pack.GAFVZR/_new 2019-08-28 16:03:44.022780192 +0200 @@ -1,15 +1,11 @@ ---- - makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - --- a/makefile +++ b/makefile -@@ -32,7 +32,7 @@ all: chk_makej +@@ -38,7 +38,7 @@ ${OMAKE} PETSC_ARCH=${PETSC_ARCH} PETSC_DIR=${PETSC_DIR} all-legacy-local 2>&1 | tee -a ${PETSC_ARCH}/lib/petsc/conf/make.log \ | ${GREP} -v "has no symbols"; \ fi - @egrep -i "( error | error: |no such file or directory)" ${PETSC_ARCH}/lib/petsc/conf/make.log | tee ${PETSC_ARCH}/lib/petsc/conf/error.log > /dev/null + @egrep -i "( error |: error: |no such file or directory)" ${PETSC_ARCH}/lib/petsc/conf/make.log | tee ${PETSC_ARCH}/lib/petsc/conf/error.log > /dev/null - @if test -s ${PETSC_ARCH}/lib/petsc/conf/error.log; then \ + +@if test -s ${PETSC_ARCH}/lib/petsc/conf/error.log; then \ printf ${PETSC_TEXT_HILIGHT}"**************************ERROR*************************************\n" 2>&1 | tee -a ${PETSC_ARCH}/lib/petsc/conf/make.log; \ echo " Error during compile, check ${PETSC_ARCH}/lib/petsc/conf/make.log" 2>&1 | tee -a ${PETSC_ARCH}/lib/petsc/conf/make.log; \ ++++++ petsc-3.3-p2-dont-check-for-option-mistakes.patch ++++++ --- /var/tmp/diff_new_pack.GAFVZR/_old 2019-08-28 16:03:44.034780190 +0200 +++ /var/tmp/diff_new_pack.GAFVZR/_new 2019-08-28 16:03:44.038780190 +0200 @@ -4,12 +4,12 @@ --- a/config/configure.py +++ b/config/configure.py -@@ -356,7 +356,7 @@ def petsc_configure(configure_options): +@@ -362,7 +362,7 @@ def petsc_configure(configure_options): try: # Command line arguments take precedence (but don't destroy argv[0]) sys.argv = sys.argv[:1] + configure_options + sys.argv[1:] - check_for_option_mistakes(sys.argv) + #check_for_option_mistakes(sys.argv) check_for_option_changed(sys.argv) - except (TypeError, ValueError), e: + except (TypeError, ValueError) as e: emsg = str(e) ++++++ petsc-3.3-p2-fix-shared-libs-sonames.patch ++++++ --- /var/tmp/diff_new_pack.GAFVZR/_old 2019-08-28 16:03:44.046780189 +0200 +++ /var/tmp/diff_new_pack.GAFVZR/_new 2019-08-28 16:03:44.046780189 +0200 @@ -4,7 +4,7 @@ --- a/config/PETSc/Configure.py +++ b/config/PETSc/Configure.py -@@ -322,6 +322,7 @@ prepend-path PATH %s +@@ -339,6 +339,7 @@ prepend-path PATH "%s" self.addDefine('SLSUFFIX','""') else: self.addMakeMacro('SL_LINKER_SUFFIX', self.setCompilers.sharedLibraryExt) ++++++ petsc-3.3-p2-no-rpath.patch ++++++ --- /var/tmp/diff_new_pack.GAFVZR/_old 2019-08-28 16:03:44.058780187 +0200 +++ /var/tmp/diff_new_pack.GAFVZR/_new 2019-08-28 16:03:44.058780187 +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.GAFVZR/_old 2019-08-28 16:03:44.066780186 +0200 +++ /var/tmp/diff_new_pack.GAFVZR/_new 2019-08-28 16:03:44.066780186 +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
