[arch-commits] Commit in root/trunk (PKGBUILD)

[Konstantin Gizdov]

    Date: Sunday, July 26, 2020 @ 21:46:20
  Author: kgizdov
Revision: 665384

upgpkg: root 6.22.00-3: fix python

Modified:
  root/trunk/PKGBUILD

----------+
 PKGBUILD |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-26 21:33:09 UTC (rev 665383)
+++ PKGBUILD	2020-07-26 21:46:20 UTC (rev 665384)
@@ -7,7 +7,7 @@
 pkgbase=root
 pkgname=('root' 'root-cuda')
 pkgver=6.22.00
-pkgrel=2
+pkgrel=3
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
 url='https://root.cern'
@@ -187,6 +187,9 @@
     ln -f rootcling genreflex
     cd "${bld_dir}" # go back
 
+    # rename the modulemap
+    mv "${pkgdir}"/usr/include/module.modulemap "${pkgdir}"/usr/include/root.modulemap
+
     # fix python env call
     sed -e 's/@python@/python/' -i "${pkgdir}/usr/lib/root/cmdLineUtils.py"
 
@@ -195,8 +198,8 @@
     local _pyver=$(get_pyver)
     local _pydir="${pkgdir}/usr/lib/python${_pyver}/site-packages"
     install -d "${_pydir}"
-    find "${pkgdir}/usr/lib/root" -maxdepth 1 -mindepth 1 \( -iname "*py*" -or -name "*Js*" \) \
-            ! \( -name "*EGPythia8*" -or -iname "*.rootmap" -or -iname "*.pcm" \) -print0 | while read -rd $'\0' _lib; do
+    find "${pkgdir}/usr/lib/root" -maxdepth 1 -mindepth 1 \( -iname '*py*' -or -name '*Js*' -or -name 'ROOT' \) \
+            ! \( -name '*EGPythia8*' -or -iname '*.rootmap' -or -iname '*.pcm' \) -print0 | while read -rd $'\0' _lib; do
         _base=$(basename "${_lib}")
         ln -sf "/usr/lib/root/${_base}" "${pkgdir}/usr/lib/python${_pyver}/site-packages/${_base}"
     done