[arch-commits] Commit in java-commons-daemon/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Wednesday, March 17, 2021 @ 10:51:55
  Author: alucryd
Revision: 410156

upgpkg: java-commons-daemon 1.2.4-1

Modified:
  java-commons-daemon/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-17 10:35:58 UTC (rev 410155)
+++ PKGBUILD	2021-03-17 10:51:55 UTC (rev 410156)
@@ -6,12 +6,12 @@
   java-commons-daemon
   java-jsvc
 )
-pkgver=1.2.3
+pkgver=1.2.4
 pkgrel=1
 arch=(x86_64)
 url=https://commons.apache.org/proper/commons-daemon/
 license=(APACHE)
-_tag=f42d76aaa22df5f6bfa2f745ba2985bc47fe28d1
+_tag=0373c020f233236ca7acf4fa4ceef31e27b7cb70
 source=(git+https://github.com/apache/commons-daemon.git#tag=${_tag})
 b2sums=(SKIP)
 makedepends=(
@@ -22,24 +22,20 @@
   maven
 )
 
-pkgver() {
-  cd commons-daemon
-
-  git describe --tags | sed 's/^COMMONS_DAEMON_//; s/_/./g'
-}
-
 prepare() {
   cd commons-daemon/src/native/unix
   support/buildconf.sh
 }
 
+pkgver() {
+  cd commons-daemon
+  git describe --tags | sed 's/^COMMONS_DAEMON_//; s/_RC.*$//; s/_/./g'
+}
+
 build() {
   cd commons-daemon
-
   mvn clean package
-
   cd src/native/unix
-
   ./configure \
     --with-java=/usr/lib/jvm/default
   make
@@ -51,7 +47,6 @@
   depends=(java-runtime)
 
   cd commons-daemon
-
   install -Dm 644 target/commons-daemon-${pkgver}.jar -t "${pkgdir}"/usr/share/java/
   ln -s commons-daemon-${pkgver}.jar "${pkgdir}"/usr/share/java/commons-daemon.jar
 }
@@ -64,7 +59,6 @@
   )
 
   cd commons-daemon/src/native/unix
-
   install -Dm 755 jsvc -t "${pkgdir}"/usr/bin/
   install -Dm 644 JSVC.1 -t "${pkgdir}"/usr/share/man/man1/
 }