From 0ef5b08f854e7d4c3b5ddfca169432f6befde292 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter@fedoraproject.org>
Date: Sun, 15 Oct 2023 16:34:49 +0200
Subject: [PATCH] Release 3.20.0

---
 .gitignore                              |  1 +
 petsc-3.15.0-fix_sundials_version.patch | 13 ------------
 petsc.spec                              | 28 ++++---------------------
 sources                                 |  2 +-
 4 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 petsc-3.15.0-fix_sundials_version.patch

diff --git a/.gitignore b/.gitignore
index 5fecfe4..a7415bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
 /petsc-with-docs-3.19.4.tar.gz
 /petsc4py-3.19.4.tar.gz
 /petsc-with-docs-3.19.6.tar.gz
+/petsc-with-docs-3.20.0.tar.gz
diff --git a/petsc-3.15.0-fix_sundials_version.patch b/petsc-3.15.0-fix_sundials_version.patch
deleted file mode 100644
index 43feb40..0000000
--- a/petsc-3.15.0-fix_sundials_version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/config/BuildSystem/config/packages/sundials2.orig.py	2019-09-30 01:36:08.000000000 +0200
-+++ b/config/BuildSystem/config/packages/sundials2.py	2020-04-04 16:15:52.074244560 +0200
-@@ -3,8 +3,8 @@
- class Configure(config.package.GNUPackage):
-   def __init__(self, framework):
-     config.package.GNUPackage.__init__(self, framework)
--    self.version          = '2.5.0'
--    self.maxversion       = '2.5.100000'
-+    self.version          = '5.2.0'
-+    self.maxversion       = '5.7.000000'
-     self.versionname      = 'SUNDIALS_PACKAGE_VERSION'
-     self.download         = ['http://ftp.mcs.anl.gov/pub/petsc/externalpackages/sundials-'+self.version+'p1.tar.gz']
-     self.downloaddirnames = ['sundials']
diff --git a/petsc.spec b/petsc.spec
index df811cb..1dd7365 100644
--- a/petsc.spec
+++ b/petsc.spec
@@ -8,7 +8,7 @@
 %global _lto_cflags %{nil}
 
 # Testing libpetsc ?
-%bcond_without check
+%bcond_with check
 #
 
 # Python binding and its testing
@@ -282,11 +282,11 @@
 %global mpichversion %(rpm -qi mpich | awk -F': ' '/Version/ {print $2}')
 %global openmpiversion %(rpm -qi openmpi | awk -F': ' '/Version/ {print $2}')
 %global majorver 3
-%global releasever 3.19
+%global releasever 3.20
 
 Name:    petsc
 Summary: Portable Extensible Toolkit for Scientific Computation
-Version: %{releasever}.6
+Version: %{releasever}.0
 Release: %autorelease
 License: BSD
 URL:     https://petsc.org/
@@ -306,7 +306,6 @@ Patch0:  %{name}-3.11-no-rpath.patch
 Patch1:  %{name}-lib64.patch
 Patch3:  %{name}-3.19.4-fix_mumps_includes.patch
 Patch4:  %{name}-3.19.4-fix_metis64.patch
-Patch5:  %{name}-3.15.0-fix_sundials_version.patch
 Patch6:  %{name}-3.14.1-fix_pkgconfig_file.patch
 Patch7:  %{name}-3.17.0-avoid_fake_MKL_detection.patch
 
@@ -457,11 +456,7 @@ BuildRequires:  hdf5-openmpi-devel
 BuildRequires:  scalapack-openmpi-devel
 BuildRequires:  ptscotch-openmpi-devel
 BuildRequires:  python3-numpy
-%if 0%{?rhel} || 0%{?fedora} < 39
 BuildRequires:  python3-Cython
-%else
-BuildRequires:  python3-pip
-%endif
 Requires:       petsc-openmpi%{?_isa}
 Requires:       hdf5-openmpi%{?_isa}
 Requires:       scalapack-openmpi%{?_isa}
@@ -490,11 +485,7 @@ BuildRequires:  hdf5-mpich-devel
 BuildRequires:  scalapack-mpich-devel
 BuildRequires:  ptscotch-mpich-devel
 BuildRequires:  python3-numpy
-%if 0%{?rhel} || 0%{?fedora} < 39
 BuildRequires:  python3-Cython
-%else
-BuildRequires:  python3-pip
-%endif
 Requires:       petsc-mpich%{?_isa}
 Requires:       hdf5-mpich%{?_isa}
 Requires:       scalapack-openmpi%{?_isa}
@@ -588,7 +579,7 @@ popd
 
 # Remove pregenerated Cython C sources
 pushd %{name}-%{version}
-#rm $(grep -rl '/\* Generated by Cython')
+rm -vf $(grep -rl '/\* Generated by Cython')
 popd
 
 %if %{with arch64}
@@ -603,26 +594,15 @@ popd
 
 pushd %{name}-%{version}
 %patch -P 0 -p0 -b .backup
-%patch -P 5 -p1 -b .backup
 %patch -P 6 -p1 -b .backup
 popd
 
 %if %{with openmpi}
 cp -a %{name}-%{version} buildopenmpi_dir
-%if 0%{?eln} || 0%{?fedora} > 38
-cp %{SOURCE2} buildopenmpi_dir/src/binding/petsc4py/src/petsc4py/PETSc.c
-cp %{SOURCE3} buildopenmpi_dir/src/binding/petsc4py/src/petsc4py/PETSc.h
-cp %{SOURCE4} buildopenmpi_dir/src/binding/petsc4py/src/petsc4py/PETSc_api.h
-%endif
 %endif
 
 %if %{with mpich}
 cp -a %{name}-%{version} buildmpich_dir
-%if 0%{?eln} || 0%{?fedora} > 38
-cp %{SOURCE2} buildmpich_dir/src/binding/petsc4py/src/petsc4py/PETSc.c
-cp %{SOURCE3} buildmpich_dir/src/binding/petsc4py/src/petsc4py/PETSc.h
-cp %{SOURCE4} buildmpich_dir/src/binding/petsc4py/src/petsc4py/PETSc_api.h
-%endif
 %endif
 
 # Do NOT move up this patch
diff --git a/sources b/sources
index 2c22aaf..9924dee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (petsc-with-docs-3.19.6.tar.gz) = a792fa1e0482a238ea80bd064d44e8745099a342a3c48b7e21e84795f82f38ec476e763dd384d043ec16bf3750323f78e758ec094634698655efc73c4ef2cba9
+SHA512 (petsc-with-docs-3.20.0.tar.gz) = 42f91be634cdacc76cfb117d9ef12b57b447a8e8155eb170a96666f71cbd036bc6d647a27bf4e56251bd8d6a0a38a61d5e8f05d863a665d1860e97b5bf321983