adopted, new pkgver function, updated to java 11

3 files changed, 20 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10f149fb3483..30adc081a37f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = jabref-git
 	pkgdesc = GUI frontend for BibTeX, written in Java -- built from git
-	pkgver = 2.9.2.r7414.gef7f8248b
+	pkgver = 5.0alpha.r14.g66b7fe3af4
 	pkgrel = 1
-	epoch = 1
 	url = https://www.jabref.org
 	arch = any
 	license = MIT
 	makedepends = git
-	makedepends = java-environment=8
-	makedepends = java-openjfx
-	depends = java-environment>=8
+	makedepends = java-environment=11
+	makedepends = java11-openjfx
+	depends = java-environment>=11
 	optdepends = gsettings-desktop-schemas: For web search support
 	provides = jabref
 	conflicts = jabref
@@ -18,7 +17,7 @@ pkgbase = jabref-git
 	source = jabref.sh
 	md5sums = SKIP
 	md5sums = 5f76feb6b2f66a2ea8b52bca999a934f
-	md5sums = 0b052f22c614f89f9ce854fdd1e5a3c8
+	md5sums = b7c7fca66fe7e0a466df1f6b3c0539ff
 
 pkgname = jabref-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c8ef4edf2e0..18a3f4f483ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,15 +7,14 @@
 # installation.
 
 pkgname=jabref-git
-pkgver=2.9.2.r7414.gef7f8248b
-epoch=1
+pkgver=5.0alpha.r14.g66b7fe3af4
 pkgrel=1
 pkgdesc="GUI frontend for BibTeX, written in Java -- built from git"
 arch=('any')
 url="https://www.jabref.org"
 license=('MIT')
-depends=('java-environment>=8')
-makedepends=('git' 'java-environment=8' 'java-openjfx')
+depends=('java-environment>=11')
+makedepends=('git' 'java-environment=11' 'java11-openjfx')
 optdepends=('gsettings-desktop-schemas: For web search support')
 provides=('jabref')
 conflicts=('jabref')
@@ -24,36 +23,34 @@ source=("${pkgname%-git}::git+https://github.com/JabRef/jabref.git"
 	"${pkgname%-git}.sh")
 md5sums=('SKIP'
          '5f76feb6b2f66a2ea8b52bca999a934f'
-         '0b052f22c614f89f9ce854fdd1e5a3c8')
+         'b7c7fca66fe7e0a466df1f6b3c0539ff')
 
 pkgver() {
-  cd ${srcdir}/${pkgname%-git}
-  git describe --long | sed 's/^v_//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd ${pkgname%-git}
+  git describe --tags | sed 's+-alpha-+alpha.r+'|cut -c2-|tr - .
 }
 
 build() {
-  cd "$srcdir/${pkgname%-git}"
-  PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
-  
+  cd ${pkgname%-git}
   ./gradlew releaseJar
 }
 
 package() {
-  cd "${srcdir}/${pkgname%-git}"
+  cd ${pkgname%-git}
 
   _release=$(sed -n 's/.*version = \"\(.*-dev\)\"/\1/p' build.gradle)
 
   find "${srcdir}/${pkgname%-git}/build/releases" \
 	  -iname "JabRef-${_release}.jar" \
-	  -exec install -Dm644 {} ${pkgdir}/usr/share/java/jabref/JabRef.jar \;
+	  -exec install -Dm644 {} "$pkgdir"/usr/share/java/jabref/JabRef.jar \;
 
-  install -Dm755 $srcdir/jabref.sh ${pkgdir}/usr/bin/jabref
+  install -Dm755 "$srcdir"/jabref.sh "$pkgdir"/usr/bin/jabref
 
-  install -Dm644 $srcdir/jabref.desktop \
-    ${pkgdir}/usr/share/applications/jabref.desktop
+  install -Dm644 "$srcdir"/jabref.desktop \
+    "$pkgdir"/usr/share/applications/jabref.desktop
 
   install -Dm644 "build/resources/main/icons/${pkgname%-git}.svg" \
-    "${pkgdir}/usr/share/pixmaps/${pkgname%-git}.svg"
+    "$pkgdir"/usr/share/pixmaps/${pkgname%-git}.svg
 
-  install -Dm644 LICENSE.md ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 LICENSE.md "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/jabref.sh b/jabref.sh
index ae2c61cf5c01..1fbbd9309a04 100644
--- a/jabref.sh
+++ b/jabref.sh
@@ -2,5 +2,5 @@
 
 # Uncomment the line below if an unsupported default is set in archlinux-java
 
-#export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
+#export PATH=/usr/lib/jvm/java-11-openjdk/jre/bin/:$PATH
 exec java -jar /usr/share/java/jabref/JabRef.jar "$@"