rpms/java-1.6.0-openjdk/F-11 .cvsignore, 1.60, 1.61 java-1.6.0-openjdk.spec, 1.139, 1.140 sources, 1.67, 1.68

Wed May 12 14:33:24 UTC 2010

Author: mmatejov

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2880

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Log Message:

* Tue Apr 20 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-35.b18
- Added icedtea6-1.8
- Added openjdk b18
- Added jdk6-jaf-%{jafdate}.zip as SOURCE9
- Added jdk6-jaxp-%{jaxpdate}.zip as SOURCE10
- Added jdk6-jaxws-%{jaxwsdate}.zip as SOURCE11
- Removed java-1.6.0-openjdk-securitypatches-20100323.patch
- Removed java-1.6.0-openjdk-linux-globals.patch
- Removed java-1.6.0-openjdk-memory-barriers.patch
- Removed java-1.6.0-pulse-audio-libs.patch
- Enabled NPPlugin



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61

--- .cvsignore	2 Mar 2010 13:27:23 -0000	1.60
+++ .cvsignore	12 May 2010 14:33:22 -0000	1.61
@@ -1,8 +1,10 @@
 mauve_tests
-java-access-bridge-1.23.0.tar.gz
 mauve-2008-10-22.tar.gz
 netbeans-profiler-visualvm_release65_mod.tar.gz
 visualvm-111-src.tar.gz
-hotspot.tar.gz
-icedtea6-1.7.1.tar.gz
-openjdk-6-src-b17-14_oct_2009.tar.gz
+java-access-bridge-1.23.0.tar.bz2
+openjdk-6-src-b18-16_feb_2010-fedora.tar.gz
+icedtea6-1.8.tar.gz
+jdk6-jaf-2009_10_27.zip
+jdk6-jaxp-2009_10_13.zip
+jdk6-jaxws-2009_10_27.zip


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/java-1.6.0-openjdk.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- java-1.6.0-openjdk.spec	6 Apr 2010 07:36:20 -0000	1.139
+++ java-1.6.0-openjdk.spec	12 May 2010 14:33:23 -0000	1.140
@@ -6,10 +6,14 @@
 # If runtests is 0 test suites will not be run.
 %define runtests 1
 
-%define icedteaver 1.7.1
+%define icedteaver 1.8
 %define icedteasnapshot %{nil}
-%define openjdkver b17
-%define openjdkdate 14_oct_2009
+%define openjdkver b18
+%define openjdkdate 16_feb_2010
+
+%define jaxpdate 2009_10_13
+%define jafdate 2009_10_27
+%define jaxwsdate 2009_10_27
 
 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
 
@@ -21,10 +25,13 @@
 
 %define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127170/
 %define netbeansurl http://icedtea.classpath.org/visualvm/
+%define jaxpurl     https://jaxp.dev.java.net/files/documents/913/147491/
+%define jafurl      http://kenai.com/projects/jdk6-drops/downloads/download/
+%define jaxwsurl    http://kenai.com/projects/jdk6-drops/downloads/download/
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
-%define fedorazip  openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz
+%define fedorazip  openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz
 
 %define mauvedate 2008-10-22
 
@@ -137,7 +144,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 34.%{openjdkver}%{?dist}
+Release: 35.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -155,13 +162,17 @@ License:  GPLv2 with exceptions
 URL:      http://icedtea.classpath.org/
 Source0:  %{url}download/source/icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz
 Source1:  %{fedorazip}
-Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
+Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2
 Source3:  %{genurl}generate-fedora-zip.sh
 Source4:  README.src
 Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
 Source7: %{netbeansurl}/netbeans-profiler-visualvm_release65_mod.tar.gz
 Source8: %{visualvmurl}/visualvm-111-src.tar.gz
+Source9: %{jafurl}jdk6-jaf-%{jafdate}.zip
+Source10: %{jaxpurl}jdk6-jaxp-%{jaxpdate}.zip
+Source11: %{jaxwsurl}jdk6-jaxws-%{jaxwsdate}.zip
+
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -170,10 +181,6 @@ Patch1:   java-1.6.0-openjdk-java-access
 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:   java-1.6.0-openjdk-linux-globals.patch
-Patch6:   java-1.6.0-openjdk-memory-barriers.patch
-Patch7:   java-1.6.0-openjdk-pulse-audio-libs.patch
-Patch8:   java-1.6.0-openjdk-securitypatches-20100323.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -389,8 +396,6 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
-%patch5
-%patch7
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
@@ -407,16 +412,16 @@ export CFLAGS="$CFLAGS -mieee"
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
-  --enable-visualvm  \
+  --enable-visualvm --with-jaf-drop-zip=%{SOURCE9} \
+  --with-jaxp-drop-zip=%{SOURCE10} --with-jaxws-drop-zip=%{SOURCE11}  \
   --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
+
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 %endif
 make patch
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH6}
-patch -l -p0 < %{PATCH8}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -882,6 +887,7 @@ exit 0
 %{_mandir}/man1/unpack200-%{name}.1*
 %{_datadir}/pixmaps/javaws.png
 %{_datadir}/applications/javaws.desktop
+%{_jvmdir}/%{jredir}/lib/security/nss.cfg
 
 %files devel
 %defattr(-,root,root,-)
@@ -963,6 +969,17 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Tue Apr 20 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-35.b18
+- Added icedtea6-1.8
+- Added openjdk b18
+- Added jdk6-jaf-%{jafdate}.zip as SOURCE9
+- Added jdk6-jaxp-%{jaxpdate}.zip as SOURCE10
+- Added jdk6-jaxws-%{jaxwsdate}.zip as SOURCE11
+- Removed java-1.6.0-openjdk-securitypatches-20100323.patch
+- Removed java-1.6.0-openjdk-linux-globals.patch
+- Removed java-1.6.0-openjdk-memory-barriers.patch
+- Removed java-1.6.0-pulse-audio-libs.patch
+- Enabled NPPlugin
 * Tue Mar 30 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-34.b17
 - Added java-1.6.0-openjdk-securitypatches-20100323.patch
 - Resolves: rhbz#575760


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	2 Mar 2010 13:27:23 -0000	1.67
+++ sources	12 May 2010 14:33:24 -0000	1.68
@@ -1,7 +1,10 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
-1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 a6756a62291ebea5c0e2431389b31380  netbeans-profiler-visualvm_release65_mod.tar.gz
 a289739f4a5bcdb9a2c642cfcc1e83fe  visualvm-111-src.tar.gz
-078fe0ab744c98694decc77f2456c560  openjdk-6-src-b17-14_oct_2009.tar.gz
-40fb37998d40ee2c9aad6087348c6306  icedtea6-1.7.1.tar.gz
+c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
+8605eab6f3b728939a0c689e51a2ba14  openjdk-6-src-b18-16_feb_2010-fedora.tar.gz
+e08dd0762749fb50ec6c273c366ee8ae  icedtea6-1.8.tar.gz
+7a50bb540a27cdd0001885630088b758  jdk6-jaf-2009_10_27.zip
+a2f7b972124cd776ff71e7754eb9a429  jdk6-jaxp-2009_10_13.zip
+3ea5728706169498b722b898a1008acf  jdk6-jaxws-2009_10_27.zip

