diff --git a/.gitignore b/.gitignore index bd27770..559741b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /petsc-3.9.3.tar.gz /petsc-3.10.2.tar.gz /petsc-3.10.3.tar.gz +/petsc-3.10.4.tar.gz diff --git a/petsc.spec b/petsc.spec index c99d2f6..5c24524 100644 --- a/petsc.spec +++ b/petsc.spec @@ -120,8 +120,8 @@ Name: petsc Summary: Portable Extensible Toolkit for Scientific Computation -Version: %{releasever}.3 -Release: 4%{?dist} +Version: %{releasever}.4 +Release: 1%{?dist} License: BSD URL: https://www.mcs.anl.gov/petsc Source0: http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-%{version}.tar.gz @@ -164,7 +164,8 @@ BuildRequires: lapack-devel BuildRequires: gcc, gcc-c++, cmake3 BuildRequires: gcc-gfortran BuildRequires: libX11-devel -BuildRequires: python2-devel, python3-sphinx +%{?fedora:BuildRequires: python2-devel} +%{?rhel:BuildRequires: python2-devel} BuildRequires: pcre-devel %if 0%{?rhel} BuildRequires: pkgconfig @@ -193,6 +194,8 @@ Portable Extensible Toolkit for Scientific Computation (developer files). %package doc Summary: Portable Extensible Toolkit for Scientific Computation (documentation files) +%{?fedora:BuildRequires: python3-sphinx} +%{?rhel:BuildRequires: python2-sphinx} BuildArch: noarch %description doc Portable Extensible Toolkit for Scientific Computation. @@ -363,17 +366,25 @@ Portable Extensible Toolkit for Scientific Computation (developer files). %setup -q -c pushd %{name}-%{version} +%if 0%{?rhel} find . -name 'setup.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|' find . -name 'configure' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|' find config -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|' find src/benchmarks/streams -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|' +%endif +%if 0%{?fedora} +find . -name 'setup.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|' +find . -name 'configure' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|' +find config -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|' +find src/benchmarks/streams -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|' +%endif + %patch3 -p0 -%if 0%{?rhel} -%patch4 -R -p1 -%endif -%if 0%{?fedora} && 0%{?fedora} < 29 + +%if 0%{?rhel} || 0%{?fedora} < 29 %patch4 -R -p1 %endif + popd %if %{with arch64} @@ -1085,6 +1096,9 @@ make -C buildmpich_dir test %endif %changelog +* Tue Mar 12 2019 Antonio Trande - 3.10.4-1 +- Release 3.10.4 + * Tue Mar 12 2019 Sandro Mani - 3.10.3-4 - Rebuild (cgnslib) diff --git a/sources b/sources index c21df3e..4195ecb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (petsc-3.10.3.tar.gz) = 638cd05555840f42ce3df9fcee45e185fa4d0db46792a206dc513aecf36767bb34c23276c3e98e7294f5968c038d3be596ed92c5ebe7d508b00e17df6d3581b1 +SHA512 (petsc-3.10.4.tar.gz) = f62915bda21b0fef4d4fa5ff6cf1d9607739caad466c97fd4694584ad7e5281442728777b3e63e0c8a37108134f929aff8e1f550993a93910ade25f6dd983466