[arch-commits] Commit in java-rxtx/trunk (PKGBUILD java-rxtx.install rxtx.install)

[Balló György]

    Date: Wednesday, August 3, 2016 @ 09:26:04
  Author: bgyorgy
Revision: 184966

upgpkg: java-rxtx 2.2pre2-3

Setup the required /run/lock/lockdev which was removed from systemd: https://github.com/systemd/systemd/commit/61f32bff6130a44d077886d38cff89ad161bf177

Added:
  java-rxtx/trunk/java-rxtx.install
Modified:
  java-rxtx/trunk/PKGBUILD
Deleted:
  java-rxtx/trunk/rxtx.install

-------------------+
 PKGBUILD          |    9 +++++++--
 java-rxtx.install |   10 ++++++++++
 rxtx.install      |    3 ---
 3 files changed, 17 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-03 09:15:22 UTC (rev 184965)
+++ PKGBUILD	2016-08-03 09:26:04 UTC (rev 184966)
@@ -5,7 +5,7 @@
 pkgname=java-rxtx
 _pkgname=rxtx
 pkgver=2.2pre2
-pkgrel=2
+pkgrel=3
 pkgdesc="Java library for serial IO"
 arch=('i686' 'x86_64')
 url="http://rxtx.qbang.org/"
@@ -14,7 +14,7 @@
 makedepends=('java-environment')
 provides=("$_pkgname=$pkgver")
 replaces=("$_pkgname")
-install=$_pkgname.install
+install=$pkgname.install
 source=(http://rxtx.qbang.org/pub/$_pkgname/$_pkgname-$pkgver.zip
         utsrelease.patch
         rxtx-2.2-lock.patch
@@ -52,4 +52,9 @@
   cd "$srcdir/$_pkgname-$pkgver"
   mkdir -p "$pkgdir"/usr/{lib,share/java/rxtx}
   make JHOME="$pkgdir/usr/share/java/rxtx" RXTX_PATH="$pkgdir/usr/lib" install
+
+  # Setup lock directory
+  install -dm755 "$pkgdir"/usr/lib/{sysusers,tmpfiles}.d
+  echo 'g lock - - -' > "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  echo 'd /run/lock/lockdev 0775 root lock -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }

Added: java-rxtx.install
===================================================================
--- java-rxtx.install	                        (rev 0)
+++ java-rxtx.install	2016-08-03 09:26:04 UTC (rev 184966)
@@ -0,0 +1,10 @@
+post_install() {
+  echo "Users need to be in 'lock' and 'uucp' groups to connect to devices"
+  systemd-sysusers "/usr/lib/sysusers.d/java-rxtx.conf"
+  systemd-tmpfiles --create "/usr/lib/tmpfiles.d/java-rxtx.conf"
+}
+
+post_upgrade() {
+  systemd-sysusers "/usr/lib/sysusers.d/java-rxtx.conf"
+  systemd-tmpfiles --create "/usr/lib/tmpfiles.d/java-rxtx.conf"
+}

Deleted: rxtx.install
===================================================================
--- rxtx.install	2016-08-03 09:15:22 UTC (rev 184965)
+++ rxtx.install	2016-08-03 09:26:04 UTC (rev 184966)
@@ -1,3 +0,0 @@
-post_install() {
-echo "Users need to be in 'lock' and 'uucp' groups to connect to devices"
-}