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

[Konstantin Gizdov]

    Date: Thursday, April 16, 2020 @ 19:34:05
  Author: kgizdov
Revision: 615353

upgpkg: root 6.20.04-1

Modified:
  root/trunk/PKGBUILD
  root/trunk/nbman-for-arch.patch
  root/trunk/settings-cuda.cmake
  root/trunk/settings.cmake

----------------------+
 PKGBUILD             |   29 ++++++++++-------------------
 nbman-for-arch.patch |    2 +-
 settings-cuda.cmake  |    2 +-
 settings.cmake       |    2 +-
 4 files changed, 13 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-16 17:24:11 UTC (rev 615352)
+++ PKGBUILD	2020-04-16 19:34:05 UTC (rev 615353)
@@ -83,12 +83,12 @@
             '43fb857c82c23016dc9ae82a591503c47d12ecbc576cb8285aa632b3e83b9839'
             '50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0'
             '558b1c882ce166ad27349460f4da2a81a9a429ad0b5e802601b6ee2714610b0e'
-            '24d38e4a075755aece47acaa49b48e88e9736d69839fab92794dae6dbd6593fc'
-            '3dea5bbf14f8ce9851b5034df9a02b68ee34cd099ecdc5d27c9540b8ce603a3e'
+            '54cae85b8ff132cd0de6654048797281a7725efaa8158a3b97ea21ce8f258ebd'
+            'b1cad3e74be54ea7ef65a522d726e608b7f5b451c036c4cbb7511f454f015f4c'
             'f33b7b6c4357b0c95cb6a19b4c7e0a1063e5a5ebe4f777f50ff7cde4d77b2241'
             '1cb2654f22b5f1de7f8621434c76266968db77a1f300de857e47d0f4ad5da217'
             'd5b135fb4d6329277e33d612f8b81b1ca60681cca96196e33ab776f3018a2fa8'
-            '58d9cd6ac3e8c7f243505c3c2d176d0d4e49c54dc5d166a4378f8bdc313cb161'
+            '49041cb8e7a9bea8288889b78c3c0cd3b9865ad29bb40901b2fb0f2650888f31'
             'd88c7d09ae2f20022d12c82bf981ae9dffeefc93d8dd766aca011b2b3193f413')
 
 get_pyver () {
@@ -223,9 +223,11 @@
     install "${srcdir}/ROOFIT_LICENSE" "${pkgdir}/usr/share/licenses/roofit/LICENSE"
     install -d "${pkgdir}/usr/share/licenses/${pkgname}"
     ln -s '/usr/share/doc/root/LICENSE' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    ln -s '/usr/share/root/fonts' "${pkgdir}/usr/share/licenses/${pkgname}/fonts"
-    ln -s '/usr/share/root/js' "${pkgdir}/usr/share/licenses/${pkgname}/js"
-    ln -s '/usr/share/licenses/rootfit' "${pkgdir}/usr/share/licenses/${pkgname}/roofit"
+    for fold in fonts js; do
+      install -d "${pkgdir}/usr/share/licenses/${pkgname}/${fold}"
+      ln -s "/usr/share/root/${fold}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/${fold}"/
+    done
+    ln -s '/usr/share/licenses/roofit' "${pkgdir}/usr/share/licenses/${pkgname}/roofit"
     if [ "${pkgname}" != "root" ]; then
         ln -s "/usr/share/licenses/${pkgname}" "${pkgdir}/usr/share/licenses/root"
         ln -s "/usr/share/doc/root" "${pkgdir}/usr/share/doc/${pkgname}"
@@ -233,8 +235,8 @@
 
     # install jupyter kernels and `root --notebook` config
     install -d "${pkgdir}/usr/share/jupyter/kernels"
-    ln -s '/etc/notebook/kernels/root' "${pkgdir}/usr/share/jupyter/kernels/root"
-    install "${srcdir}/jupyter_notebook_config.py" "${pkgdir}/etc/notebook"/
+    ln -s '/etc/root/notebook/kernels/root' "${pkgdir}/usr/share/jupyter/kernels/root"
+    install "${srcdir}/jupyter_notebook_config.py" "${pkgdir}/etc/root/notebook"/
 
     # drop thisroot.* shell files
     rm -rf "${pkgdir}"/usr/bin/thisroot.*
@@ -242,17 +244,6 @@
     for suffix in csh fish; do
         ln -s '/usr/bin/thisroot.sh' "${pkgdir}/usr/bin/thisroot.${suffix}"
     done
-
-    # strip build paths
-    find "${pkgdir}/" -type f -print0 | while read -rd $'\0' _file; do
-        sed -b -e "s@${bld_dir}/lib@/usr/lib/root at g" \
-               -e "s@${bld_dir}/etc@/etc at g" \
-               -e "s@${bld_dir}/include@/usr/include at g" \
-               -e "s@${bld_dir}/input@/input at g" \
-               -e "s@${srcdir}/${pkgbase}-${pkgver}@@g" \
-               -e "s@${srcdir}/${pkgbase}-${pkgver}-cuda@@g" \
-            -i "${_file}"
-    done
 }
 
 package_root() {

Modified: nbman-for-arch.patch
===================================================================
--- nbman-for-arch.patch	2020-04-16 17:24:11 UTC (rev 615352)
+++ nbman-for-arch.patch	2020-04-16 19:34:05 UTC (rev 615353)
@@ -170,7 +170,7 @@
 -
     // Set IPython directory for the ROOT notebook flavour
 -   string rootnbpath = homedir + pathsep + ROOTNB_DIR;
-+   string rootnbpath = pathsep + string("etc") + pathsep + string("notebook");
++   string rootnbpath = pathsep + string("etc") + pathsep + string("root") + pathsep + string("notebook");
     string jupyconfdir(JUPYTER_CONF_DIR_V + ("=" + rootnbpath));
     string jupypathdir(JUPYTER_PATH_V + ("=" + rootnbpath));
     putenv((char *)jupyconfdir.c_str());

Modified: settings-cuda.cmake
===================================================================
--- settings-cuda.cmake	2020-04-16 17:24:11 UTC (rev 615352)
+++ settings-cuda.cmake	2020-04-16 19:34:05 UTC (rev 615353)
@@ -5,7 +5,7 @@
 set (CMAKE_INSTALL_BINDIR /usr/bin CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_LIBDIR /usr/lib/root CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_INCLUDEDIR /usr/include CACHE PATH "" FORCE)
-set (CMAKE_INSTALL_SYSCONFDIR /etc CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_SYSCONFDIR /etc/root CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_DATAROOTDIR /usr/share CACHE PATH "" FORCE)
 set (CMAKE_CXX_STANDARD 14 CACHE STRING "" FORCE)
 set (alien OFF CACHE BOOL "" FORCE)

Modified: settings.cmake
===================================================================
--- settings.cmake	2020-04-16 17:24:11 UTC (rev 615352)
+++ settings.cmake	2020-04-16 19:34:05 UTC (rev 615353)
@@ -5,7 +5,7 @@
 set (CMAKE_INSTALL_BINDIR /usr/bin CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_LIBDIR /usr/lib/root CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_INCLUDEDIR /usr/include CACHE PATH "" FORCE)
-set (CMAKE_INSTALL_SYSCONFDIR /etc CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_SYSCONFDIR /etc/root CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_DATAROOTDIR /usr/share CACHE PATH "" FORCE)
 set (CMAKE_CXX_STANDARD 17 CACHE STRING "" FORCE)
 set (alien OFF CACHE BOOL "" FORCE)