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

[Konstantin Gizdov]

    Date: Tuesday, December 3, 2019 @ 18:42:17
  Author: kgizdov
Revision: 534981

upgpkg: root 6.18.04-6

upgpkg: root 6.18.04-6

Modified:
  root/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-03 18:39:09 UTC (rev 534980)
+++ PKGBUILD	2019-12-03 18:42:17 UTC (rev 534981)
@@ -7,7 +7,7 @@
 pkgbase=root
 pkgname=('root' 'root-cuda')
 pkgver=6.18.04
-pkgrel=5
+pkgrel=6
 pkgdesc='C++ data analysis framework and interpreter from CERN'
 arch=('x86_64')
 url='https://root.cern.ch'
@@ -210,15 +210,15 @@
     install -Dm644 "${bld_dir}/root.pc.tpl" "${pkgdir}/usr/lib/pkgconfig/root.pc"
 
     # put CMake config in correct path and fix relative paths
-    install -d "${pkgdir}/usr/lib/cmake"
-    mv "${pkgdir}/usr/share/root/cmake"/* "${pkgdir}/usr/lib/cmake"/
+    install -d "${pkgdir}/usr/lib/cmake/ROOT"
+    mv "${pkgdir}/usr/share/root/cmake"/* "${pkgdir}/usr/lib/cmake/ROOT"/
     rm -rf "${pkgdir}/usr/share/root/cmake"
     sed -e "s at ROOT_INCLUDE_DIRS .*include\"@ROOT_INCLUDE_DIRS \"${_incdir}\"@" \
         -e "s at ROOT_LIBRARY_DIR .*lib/root\"@ROOT_LIBRARY_DIR \"${_libdir}\"@" \
         -e "s at ROOT_BINARY_DIR .*bin\"@ROOT_BINARY_DIR \"${_bindir}\"@" \
         -e 's@# ROOT configured for the install with relative paths, so use these@# ROOT was patched to use correct absolute paths, specifically these at g' \
-        -i "${pkgdir}"/usr/lib/cmake/ROOTConfig.cmake
-    ln -sf "/usr/lib/root/cmake/cling" "${pkgdir}/usr/lib/cmake/cling"
+        -i "${pkgdir}"/usr/lib/cmake/ROOT/ROOTConfig.cmake
+    ln -sf "/usr/lib/root/cmake/cling" "${pkgdir}/usr/lib/cmake/ROOT/cling"
 }
 
 package_root() {