Bump version to 2.9.0.2

2 files changed, 19 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86af3a573555..49ddf0d081d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dune-fem
 	pkgdesc = A discretization module providing an implementation of mathematical abstractions to solve PDEs on parallel computers including local grid adaptivity, dynamic load balancing, and higher order discretization schemes
-	pkgver = 2.9.0
-	pkgrel = 2
+	pkgver = 2.9.0.2
+	pkgrel = 1
 	url = https://dune-project.org/modules/dune-fem
 	arch = x86_64
 	license = GPL2
@@ -9,9 +9,9 @@ pkgbase = dune-fem
 	makedepends = graphviz
 	makedepends = python-scikit-build
 	makedepends = python-ninja
-	depends = dune-alugrid>=2.9.0
-	depends = dune-istl>=2.9.0
-	depends = dune-localfunctions>=2.9.0
+	depends = dune-alugrid>=2.9.0.2
+	depends = dune-istl>=2.9.0.2
+	depends = dune-localfunctions>=2.9.0.2
 	depends = python-matplotlib
 	depends = python-scipy
 	depends = python-ufl
@@ -21,12 +21,7 @@ pkgbase = dune-fem
 	optdepends = papi: for events supported
 	optdepends = dune-spgrid: for implement structured, parallel grid
 	optdepends = dune-polygongrid: for implement DUNE grid consisting of polygons
-	source = https://dune-project.org/download/2.9.0/dune-fem-2.9.0.tar.gz
-	source = https://dune-project.org/download/2.9.0/dune-fem-2.9.0.tar.gz.asc
-	source = include.patch::https://gitlab.dune-project.org/dune-fem/dune-fem/-/commit/43a596eba13fa528e8c62be9ad31c9b7f63e6260.patch
-	validpgpkeys = E5B47782DE09813BCC3518E159DA94F1FC8FD313
-	sha512sums = c36623035934ed7ea95d1c8c4ae2e14a11c84cdc89a8c3625ec8dd2b029824cf8aa7fc8b345ccad59c0a6a47f4688abff4c11c4d5a853cbe27becc7f793109fc
-	sha512sums = SKIP
-	sha512sums = 9ab59b5daec2e39f0fd2636892aedf9fb5930d1ff27a0fdea782a818d73605363c60d78212f38bc4adcab16d9cc32a64bf534c5da9c1be012d5cd272c15a4489
+	source = https://gitlab.dune-project.org/dune-fem/dune-fem/-/archive/v2.9.0.2/dune-fem-v2.9.0.2.tar.gz
+	sha512sums = ea4555dcc6743da34c7babf24bd6d6897d01c25fb09aa0d9e35086572759d01466eefde04510d472ed190d690f0e69afa63dc7e5b75eb257a54370027c20e0a2
 
 pkgname = dune-fem
diff --git a/PKGBUILD b/PKGBUILD
index 068d65f0cdf3..db135416c061 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
 # Maintainer: Carlos Aznarán <caznaranl@uni.pe>
 pkgname=dune-fem
-_tarver=2.9.0
-_tar="${_tarver}/${pkgname}-${_tarver}.tar.gz"
-pkgver="${_tarver}"
-pkgrel=2
+_tarver=v2.9.0.2
+_tar=${_tarver}/${pkgname}-${_tarver}.tar.gz
+pkgver=${_tarver/v/}
+pkgrel=1
 pkgdesc="A discretization module providing an implementation of mathematical abstractions to solve PDEs on parallel computers including local grid adaptivity, dynamic load balancing, and higher order discretization schemes"
 arch=(x86_64)
 url="https://dune-project.org/modules/${pkgname}"
@@ -16,27 +16,21 @@ optdepends=('doxygen: Generate the class documentation from C++ sources'
   'papi: for events supported'
   'dune-spgrid: for implement structured, parallel grid'
   'dune-polygongrid: for implement DUNE grid consisting of polygons')
-source=(https://dune-project.org/download/${_tar}{,.asc}
-  include.patch::https://gitlab.dune-project.org/${pkgname}/${pkgname}/-/commit/43a596eba13fa528e8c62be9ad31c9b7f63e6260.patch)
-sha512sums=('c36623035934ed7ea95d1c8c4ae2e14a11c84cdc89a8c3625ec8dd2b029824cf8aa7fc8b345ccad59c0a6a47f4688abff4c11c4d5a853cbe27becc7f793109fc'
-  'SKIP'
-  '9ab59b5daec2e39f0fd2636892aedf9fb5930d1ff27a0fdea782a818d73605363c60d78212f38bc4adcab16d9cc32a64bf534c5da9c1be012d5cd272c15a4489')
-validpgpkeys=('E5B47782DE09813BCC3518E159DA94F1FC8FD313') # Andreas Dedner <a.s.dedner@warwick.ac.uk>
+source=(https://gitlab.dune-project.org/${pkgname}/${pkgname}/-/archive/${_tar})
+sha512sums=('ea4555dcc6743da34c7babf24bd6d6897d01c25fb09aa0d9e35086572759d01466eefde04510d472ed190d690f0e69afa63dc7e5b75eb257a54370027c20e0a2')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
   export _pyversion=$(python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")
-  patch -p1 -i ../include.patch
-  sed -i 's/^Python-Requires: fenics-ufl==2019.1.0/Python-Requires: fenics-ufl>=2019.1.0/' dune.module
+  sed -i 's/fenics-ufl==2022.2.0/fenics-ufl>=2022.2.0/' ${pkgname}-${_tarver}/dune.module
   # https://gitlab.dune-project.org/dune-fem/dune-fem/-/issues/111
-  sed -i '/  FindPThreads.cmake/d' cmake/modules/CMakeLists.txt
-  sed -i '/  FindSIONlib.cmake/d' cmake/modules/CMakeLists.txt
-  sed -i 's/^Version: '"${pkgver%%.0}"'/Version: '"${pkgver}"'/' dune.module
+  sed -i '/  FindPThreads.cmake/d' ${pkgname}-${_tarver}/cmake/modules/CMakeLists.txt
+  sed -i '/  FindSIONlib.cmake/d' ${pkgname}-${_tarver}/cmake/modules/CMakeLists.txt
+  sed -i 's/^Version: '"${pkgver::3}"'/Version: '"${pkgver}"'/' ${pkgname}-${_tarver}/dune.module
   python -m venv --system-site-packages _skbuild/linux-${CARCH}-${_pyversion}/cmake-build/dune-env
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${_tarver}
 
   XDG_CACHE_HOME="${PWD}" \
     python setup.py build \
@@ -64,7 +58,7 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${_tarver}
   PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py --skip-cmake install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
   install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
   find "${pkgdir}" -type d -empty -delete