From 111b18e76114f1a46a23a979a7872e7fda412601 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 21 Feb 2013 00:03:57 -0800
Subject: Thu Feb 21 00:03:56 PST 2013

---
 extra/java7-openjdk/PKGBUILD | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'extra/java7-openjdk/PKGBUILD')

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index e1da18b2d..348991cd9 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177976 2013-02-12 18:43:03Z andyrtr $
+# $Id: PKGBUILD 178359 2013-02-20 19:02:07Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -8,17 +8,17 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk'
 pkgbase=java7-openjdk
 _java_ver=7
 _updatever=u13
-_icedtea_ver=2.3.6
+_icedtea_ver=2.3.7
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=97a8b625f6e9
-_JAXP_CHANGESET=d7feafb8427b
-_JAXWS_CHANGESET=b900024eb4ba
-_JDK_CHANGESET=6bb01322bb5a
-_LANGTOOLS_CHANGESET=e0739a8783d1
-_OPENJDK_CHANGESET=dd8d1a8f222f
+_CORBA_CHANGESET=82e58144c3fb
+_JAXP_CHANGESET=1d46a56eb51c
+_JAXWS_CHANGESET=b9590aa972b9
+_JDK_CHANGESET=6a3417030605
+_LANGTOOLS_CHANGESET=b5006c3285c6
+_OPENJDK_CHANGESET=506161df1c48
 
-_HOTSPOT_CHANGESET=bc0de5a0ece2 # see "${srcdir}/icedtea7"/hotspot.map
+_HOTSPOT_CHANGESET=104e2c65892d # see "${srcdir}/icedtea7"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -50,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('f55f2f2e5cdfa8b0429eaa56b4ecba7d63c701e867dbb636883c03cd8e64f4f9'
-            'a360299dd869d612b77a016967678716cb03dfddd0f484944a1619fda5fb6092'
-            '511f9517374babed86f9d3d60d06f0fb7614cff14431a4eb678967b6f1358b1d'
-            '81f30228dfab5669b114841a0b797c6529a5e37ca52eb97c7f9bbfd29aae9941'
-            '276fcc2f7609dd5a9346f9faa317331e722c9c015fa19c61a1228d86cf231bc2'
-            'a2d4557222eb72b9f1ecf6cfd19c73eb0a02e2f9755eacacabb4c43c682095e2'
-            '85170ef7a68ef8e2895edffd9a4209f78b43887e8c782bebfe14997d06619bdb'
-            '4b571c99b9dfdca6e8456a7d0d47eedb1a8e3c4863322cc853f959b1cb4bc068'
+sha256sums=('378f67f6f84bfb6c705f600b47b68a61b18d67648dd7eaf8498b152587695940'
+            '704bdd40bc328183384272ee282310d8fc3216f3051e504141e7660fe50185a0'
+            'c438607d04e04439ca7df3d911f3cf46ac64066a5b21da98bea8070f98abdafe'
+            'fca2c95b3e60533a937e4f8d497a2934382d9f1f95cde874d926f3b4841407ce'
+            'c6ca4f98b35acdb24a81721de0bee2686bb83917bd84b108775e586c5ae81136'
+            '2a8afd9ecb53e255e436885e6fe3e9882e8657c70482a90ef39aa33e024e79b0'
+            '44d8bc14b213b7c218465a8859bd551feb6805857077ca6aa68aaa4c1b10b676'
+            '203acf2f9737032fe4bb1096e2f81417fa8a92a7016d8220b54a70efd579711a'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
             'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
@@ -135,7 +135,6 @@ package_jre7-openjdk-headless() {
               'fontconfig: needed for Java Mauve support - libmawt.so')
   provides=('java-runtime-headless=7')
   conflicts=('openjdk6')
-  #  replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
   backup=(etc/profile.d/jre.sh
           etc/profile.d/jre.csh
           etc/java-7-openjdk/calendars.properties
@@ -289,7 +288,7 @@ package_jdk7-openjdk() {
   depends=('jre7-openjdk')
   provides=('java-environment=7')
   conflicts=('java-environment')
-  #  replaces=('openjdk6')
+  replaces=('openjdk6')
   backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
 
   cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
@@ -337,7 +336,8 @@ package_jdk7-openjdk() {
 
 package_openjdk7-src() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
-
+  replaces=('openjdk6-src')
+  
   install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
              ${pkgdir}/${_jvmdir}/src.zip
 }
-- 
cgit v1.2.3-54-g00ecf