[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)

Guillaume Alaux guillaume at archlinux.org
Thu Dec 18 14:43:28 UTC 2014


    Date: Thursday, December 18, 2014 @ 15:43:28
  Author: guillaume
Revision: 227748

Use function for pkgver

Modified:
  java7-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-18 14:42:05 UTC (rev 227747)
+++ PKGBUILD	2014-12-18 14:43:28 UTC (rev 227748)
@@ -7,14 +7,16 @@
 pkgbase=java7-openjdk
 _java_ver=7
 _icedtea_ver=2.5.3
+pkgver() {
+  _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
+    | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
+  echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
+}
+pkgver=7.u71_2.5.3
+pkgrel=3
 
-# check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_JDK_UPDATE_VERSION=71
-
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
-pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
-pkgrel=3
 arch=('i686' 'x86_64')
 url='http://icedtea.classpath.org'
 license=('custom')



More information about the arch-commits mailing list