[java-1.6.0-openjdk] adde new openjdk, jaxp and jaxw2 source archives

[jiri vanek]

commit 13b94dd1648b9c9a6d133487fccdc240bba7b77d
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Fri Jan 27 19:25:24 2012 +0100

    adde new openjdk, jaxp and jaxw2 source archives

 .gitignore              |    3 +++
 java-1.6.0-openjdk.spec |   17 +++++++++--------
 sources                 |    7 ++++---
 3 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4cd4316..fed7318 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,6 @@ icedtea6-1.8.tar.gz
 /icedtea6-1.10.4.tar.gz
 /icedtea6-1.10.5.tar.gz
 /icedtea6-1.11pre.tar.gz
+/jaxp144_03.zip
+/jdk6-jaxws2_1_6-2011_06_13.zip
+/openjdk-6-src-b24-14_nov_2011-fedora.tar.gz
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 1303868..c8a8210 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -8,8 +8,8 @@
 
 %define icedteaver 1.11pre
 %define icedteasnapshot %{nil}
-%define openjdkver b22
-%define openjdkdate 28_feb_2011
+%define openjdkver b24
+%define openjdkdate 14_nov_2011
 
 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
 
@@ -163,9 +163,9 @@ Source4:  README.src
 Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
 Source7:  %{hotspoturl}hotspot.tar.gz
-Source8:  %{jaxpurl}jaxp144_01.zip
+Source8:  %{jaxpurl}jaxp144_03.zip
 Source9:  %{jafurl}jdk6-jaf-b20.zip
-Source10: %{jaxwsurl}jdk6-jaxws-b20.zip
+Source10: %{jaxwsurl}jdk6-jaxws2_1_6-2011_06_13.zip
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -174,7 +174,7 @@ Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
 Patch2:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
 Patch3:	  java-1.6.0-openjdk-java-access-bridge-security.patch
 Patch4:   java-1.6.0-openjdk-accessible-toolkit.patch
-Patch5:   makefile-xalan-deps.patch
+#Patch5:   makefile-xalan-deps.patch
 #Patch6:   glibc-name-clash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -191,8 +191,9 @@ BuildRequires: libXtst-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: wget
-BuildRequires: xalan-j2
-BuildRequires: xerces-j2
+#BuildRequires: xalan-j2
+#BuildRequires: xerces-j2
+BuildRequires: libxslt
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: mercurial
 BuildRequires: ant
@@ -370,7 +371,7 @@ export ARCH_DATA_MODEL=64
 export CFLAGS="$CFLAGS -mieee"
 %endif
 
-patch -l -p0 < %{PATCH5}
+#patch -l -p0 < %{PATCH5}
 
 ./autogen.sh
 
diff --git a/sources b/sources
index 1ca62fc..e547444 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,10 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
-3bb82df0931f791674875321f54140f3  openjdk-6-src-b22-28_feb_2011-fedora.tar.gz
-ef7a8b3624ea904bf584bc46d79b5e75  jaxp144_01.zip
 91adfd41e6f001add4f92ae31216b1e3  jdk6-jaxws-b20.zip
-bc95c133620bd68c161cac9891592901  jdk6-jaf-b20.zip
 369ad745bf697d525d1a00fc09906829  hotspot.tar.gz
 781b3573d79921bb82785674a1c9dd8a  icedtea6-1.11pre.tar.gz
+9eea471ad474040265c688858fcf09aa  jaxp144_03.zip
+bc95c133620bd68c161cac9891592901  jdk6-jaf-b20.zip
+8fd91b09b643a19a912b8a75e7a7a9d5  jdk6-jaxws2_1_6-2011_06_13.zip
+7ecb35d87da256e2d4510ce22f56a2bd  openjdk-6-src-b24-14_nov_2011-fedora.tar.gz