Fix variables in order to work with helpers Jguer/yay/issues/1006

2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce0c309b3cd4..870e003082f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dune-common
 	pkgdesc = Infrastructure and foundation classes
 	pkgver = 2.9.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://dune-project.org/modules/dune-common
 	arch = x86_64
 	license = custom:GPL2 with runtime exception
diff --git a/PKGBUILD b/PKGBUILD
index c07eed923eec..1d51a6589e6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dune-common
 _tarver=2.9.0
 _tar="${_tarver}/${pkgname}-${_tarver}.tar.gz"
 pkgver="${_tarver}"
-pkgrel=1
+pkgrel=2
 pkgdesc="Infrastructure and foundation classes"
 arch=(x86_64)
 url="https://dune-project.org/modules/${pkgname}"
@@ -33,7 +33,7 @@ validpgpkeys=('E5B47782DE09813BCC3518E159DA94F1FC8FD313') # Andreas Dedner <a.s.
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  export _pyversion=$(python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")
+  local _pyversion=$(python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")
   sed -i 's/^Version: '"${pkgver%%.0}"'-git/Version: '"${pkgver}"'/' dune.module
   # https://salsa.debian.org/science-team/dune-common/-/blob/master/debian/patches/skip-dirs-starting-with-dot.patch
   sed -i 's/^        $(find -H "$dir" -name $CONTROL | $GREP -v '\''dune-\[-_a-zA-Z\]\/dune-\[-a-zA-Z_\]\*-\[0-9\]\\{1,\\}.\[0-9\]\\{1,\\}\/'\'')/        $(find -H "$dir" -name '\''.?\*'\'' -prune -o -name $CONTROL -print | $GREP -v '\''dune-\[-_a-zA-Z\]\/dune-\[-a-zA-Z_\]\*-\[0-9\]\\{1,\\}.\[0-9\]\\{1,\\}\/'\'')/' lib/dunemodules.lib
@@ -63,6 +63,7 @@ build() {
     -DDUNE_PYTHON_WHEELHOUSE="dist" \
     -DCMAKE_DISABLE_FIND_PACKAGE_Vc=TRUE
 
+  local _pyversion=$(python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")
   cmake --build _skbuild/linux-${CARCH}-${_pyversion}/cmake-build --target sphinx_html
 }
 
@@ -70,6 +71,7 @@ package() {
   cd ${pkgname}-${pkgver}
   PYTHONPYCACHEPREFIX="${PWD}/.cache/cpython/" python setup.py --skip-cmake install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
   install -d "${pkgdir}"/usr/share/doc/"${pkgname}"/buildsystem
+  local _pyversion=$(python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")
   mv _skbuild/linux-${CARCH}-${_pyversion}/cmake-build/doc/buildsystem/html/* "${pkgdir}"/usr/share/doc/${pkgname}/buildsystem
   install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
   find "${pkgdir}" -type d -empty -delete