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

[Sven-Hendrik Haase]

    Date: Saturday, January 25, 2020 @ 04:44:10
  Author: svenstaro
Revision: 555396

upgpkg: zeroc-ice 3.7.3-2: rebuild

Modified:
  zeroc-ice/trunk/PKGBUILD

----------+
 PKGBUILD |   45 ++++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-25 04:41:50 UTC (rev 555395)
+++ PKGBUILD	2020-01-25 04:44:10 UTC (rev 555396)
@@ -4,9 +4,9 @@
 # Contributor: Otto Allmendinger <otto.allmendinger at gmail.com>
 
 pkgname=(zeroc-ice zeroc-ice-java)
-pkgbase=(zeroc-ice)
+pkgbase=zeroc-ice
 pkgver=3.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="An object-oriented middleware that provides RPC functionality"
 arch=(x86_64)
 url="https://zeroc.com"
@@ -31,7 +31,7 @@
 )
 
 build() {
-  cd ${srcdir}/ice-${pkgver}
+  cd "${srcdir}"/ice-${pkgver}
   make "${_make_args[@]}" "LANGUAGES=cpp java"
 }
 
@@ -41,39 +41,38 @@
           "etc/icegridregistry.conf"
   )
 
-  cd ${srcdir}/ice-${pkgver}
+  cd "${srcdir}"/ice-${pkgver}
 
   make install "${_make_args[@]}" DESTDIR="${pkgdir}" "LANGUAGES=cpp"
-  install -Dm644 ${srcdir}/ice-${pkgver}/ICE_LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 "${srcdir}"/ice-${pkgver}/ICE_LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 
-  rm -f ${pkgdir}/usr/share/Ice-${pkgver}/LICENSE
-  rm -f ${pkgdir}/usr/share/Ice-${pkgver}/ICE_LICENSE
+  rm -f "${pkgdir}"/usr/share/Ice-${pkgver}/LICENSE
+  rm -f "${pkgdir}"/usr/share/Ice-${pkgver}/ICE_LICENSE
 
-  rm -df ${pkgdir}/usr/lib/
-  mv ${pkgdir}/usr/lib64/ ${pkgdir}/usr/lib/
+  rm -df "${pkgdir}"/usr/lib/
+  mv "${pkgdir}"/usr/lib64/ "${pkgdir}"/usr/lib/
 
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/glacier2router.conf ${pkgdir}/etc/glacier2router.conf
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridnode.conf ${pkgdir}/etc/icegridnode.conf
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridregistry.conf ${pkgdir}/etc/icegridregistry.conf
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/glacier2router.conf "${pkgdir}"/etc/glacier2router.conf
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/icegridnode.conf "${pkgdir}"/etc/icegridnode.conf
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/icegridregistry.conf "${pkgdir}"/etc/icegridregistry.conf
 
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/glacier2router.service \
-                 ${pkgdir}/usr/lib/systemd/system/glacier2router.service
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridnode.service \
-                 ${pkgdir}/usr/lib/systemd/system/icegridnode.service
-  install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridregistry.service \
-                 ${pkgdir}/usr/lib/systemd/system/icegridregistry.service
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/glacier2router.service \
+                 "${pkgdir}"/usr/lib/systemd/system/glacier2router.service
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/icegridnode.service \
+                 "${pkgdir}"/usr/lib/systemd/system/icegridnode.service
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/icegridregistry.service \
+                 "${pkgdir}"/usr/lib/systemd/system/icegridregistry.service
 
-  mkdir -p ${pkgdir}/var/lib/ice/icegrid/{node1,registry}
-  chown -R 101:101 ${pkgdir}/var/lib/ice
+  mkdir -p "${pkgdir}"/var/lib/ice/icegrid/{node1,registry}
+  chown -R 101:101 "${pkgdir}"/var/lib/ice
 
-  install -Dm644 ${srcdir}/zeroc-ice.sysusers ${pkgdir}/usr/lib/sysusers.d/$pkgname.conf
+  install -Dm644 "${srcdir}"/zeroc-ice.sysusers "${pkgdir}"/usr/lib/sysusers.d/$pkgname.conf
 }
 
 package_zeroc-ice-java() {
-  makedepends=(gradle 'java-environment=8')
   depends=(zeroc-ice java-environment)
 
-  cd ${srcdir}/ice-${pkgver}
+  cd "${srcdir}"/ice-${pkgver}
 
   export GRADLE_USER_HOME=/tmp
   make install "${_make_args[@]}" DESTDIR="${pkgdir}" "LANGUAGES=java"