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

[Guillaume Alaux]

    Date: Friday, January 23, 2015 @ 00:08:34
  Author: guillaume
Revision: 229663

Revert adding JAR for tzdata. Upstream release 7.u75_2.5.4-1

Modified:
  java7-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-22 21:54:35 UTC (rev 229662)
+++ PKGBUILD	2015-01-22 23:08:34 UTC (rev 229663)
@@ -6,7 +6,7 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.5.3
+_icedtea_ver=2.5.4
 pkgver() {
   _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
     | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
@@ -13,7 +13,7 @@
   echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
 }
 pkgver=7.u71_2.5.3
-pkgrel=3
+pkgrel=1
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -40,14 +40,14 @@
         openjdk7_nonreparenting-wm.diff
         giflib_5.1.diff)
 
-sha256sums=('44df11ac8e5ace7194e7372ef169909e0dab31d6b2f6bbae9a9c33af2cc54540'
-            '3ba1a30762f5d5890e8ee6af11f52213ab9c574c01f07c75a081c42034f5d5c9'
-            '8ceb2cd60782b7fc14b88e3d366f273873fa5436cf0e36b86406c0905b7dc43c'
-            '2d13a82078f3f2b8831d1e670e5e75719336a56490df64f16ab7647674a272ef'
-            '5a63d85307203f1aed1e31459ad5e32687909e0640d424ff6f540d9b1cceeb1e'
-            '40c4dda969be0ecd213e79269184e19cfc32100b83777dc529b3cf4b6aa3e12f'
-            '516f6c21719f4b5a2092847c147cde7890c5a30d4aed9425ff667c0164ef1dd0'
-            '8c8e1f7e97f47fe4029e0b0ba42b3515474adabe64e1fbee15c0e2e22a13aa28'
+sha256sums=('5301b9a8592af2cf8e3e7a3650e5e1fe744c6d2de7f8ff78080b2eeae86a9800'
+            '88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1'
+            '7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b'
+            '84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3'
+            '4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b'
+            'e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09'
+            '4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a'
+            '4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
             '77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9')
@@ -153,8 +153,6 @@
 
   install -d -m755 "${pkgdir}${_jvmdir}/jre"
   cp -a bin lib "${pkgdir}${_jvmdir}/jre"
-  # Used to compile tzdata files
-  cp ../btjars/compilefontconfig.jar ../btjars/javazic.jar lib/
 
   # Set config files
   mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.properties.src,properties}