rpms/java-1.6.0-openjdk/F-13 .cvsignore, 1.65, 1.66 java-1.6.0-openjdk.spec, 1.149, 1.150 sources, 1.73, 1.74

[Martin Matejovic]

Author: mmatejov

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

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-38.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
- Updated netbeans-profiler-visualvm_release68.tar.gz
- 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
- Resolved: rhbz#580432



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-13/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore	2 Mar 2010 14:12:21 -0000	1.65
+++ .cvsignore	5 May 2010 16:07:34 -0000	1.66
@@ -1,7 +1,10 @@
 mauve_tests
 mauve-2008-10-22.tar.gz
-netbeans-profiler-visualvm_release65_mod.tar.gz
-visualvm-111-src.tar.gz
 java-access-bridge-1.23.0.tar.bz2
-openjdk-6-src-b17-14_oct_2009.tar.gz
-icedtea6-1.7.1.tar.gz
+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
+netbeans-profiler-visualvm_release68.tar.gz
+visualvm-111-src.tar.gz


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-13/java-1.6.0-openjdk.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- java-1.6.0-openjdk.spec	8 Apr 2010 13:49:36 -0000	1.149
+++ java-1.6.0-openjdk.spec	5 May 2010 16:07:35 -0000	1.150
@@ -4,12 +4,16 @@
 %define gcjbootstrap 0
 
 # If runtests is 0 test suites will not be run.
-%define runtests 1
+%define runtests 0
 
-%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/
 
@@ -18,14 +22,16 @@
 %define accessver %{accessmajorver}.%{accessminorver}
 %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
+%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 visualvmurl https://visualvm.dev.java.net/files/documents/7163/127170/
 %define netbeansurl http://icedtea.classpath.org/visualvm/
-%define hotspoturl  http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk6/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
 
@@ -68,7 +74,7 @@
 %define icedteaopt %{nil}
 %else
 %ifarch %{jit_arches}
-%define icedteaopt --with-openjdk --enable-systemtap --enable-npplugin
+%define icedteaopt --with-openjdk --enable-systemtap
 %else
 %define icedteaopt --with-openjdk
 %endif
@@ -137,7 +143,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 37.%{openjdkver}%{?dist}
+Release: 38.%{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
@@ -160,8 +166,12 @@ Source3:  %{genurl}generate-fedora-zip.s
 Source4:  README.src
 Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
-Source7: %{netbeansurl}/netbeans-profiler-visualvm_release65_mod.tar.gz
+Source7: %{netbeansurl}/netbeans-profiler-visualvm_release68.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,9 +180,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-memory-barriers.patch
-Patch6:   java-1.6.0-openjdk-linux-globals.patch
-Patch7:   java-1.6.0-openjdk-securitypatches-20100323.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -230,7 +237,7 @@ BuildRequires: libffi-devel
 BuildRequires: systemtap-sdt-devel
 %endif
 # visualvm build requirements.
-BuildRequires: netbeans
+BuildRequires: netbeans >= 6.8
 BuildRequires: jakarta-commons-logging
 
 Requires: rhino
@@ -382,7 +389,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
-%patch6
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
@@ -399,7 +405,8 @@ 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
@@ -407,8 +414,6 @@ make stamps/patch-ecj.stamp
 make patch
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH5}
-patch -l -p0 < %{PATCH7}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -581,7 +586,7 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
 # Find JRE files.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
   | grep -v jre/lib/security \
-  | grep -v IcedTeaNPPlugin.so \
+  | grep -v IcedTeaPlugin.so \
   | sed 's|'$RPM_BUILD_ROOT'||' \
   >> %{name}.files
 # Find demo directories.
@@ -822,16 +827,13 @@ exit 0
 if [ $1 -gt 1 ]
 then
   alternatives --remove %{javaplugin} \
-    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so 2>/dev/null
-  	
-  alternatives --remove %{javaplugin} \
-    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so 2>/dev/null
+    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so 2>/dev/null  	
 fi
 
 
 alternatives \
   --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
-  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so %{priority}
+  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so %{priority}
 
 exit 0
 
@@ -839,7 +841,7 @@ exit 0
 if [ $1 -eq 0 ]
 then
   alternatives --remove %{javaplugin} \
-    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so
+    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so
 fi
 
 exit 0
@@ -878,6 +880,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,-)
@@ -957,9 +960,21 @@ exit 0
 
 %files plugin
 %defattr(-,root,root,-)
-%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaNPPlugin.so
+%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Tue Apr 20 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-38.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
+- Updated netbeans-profiler-visualvm_release68.tar.gz
+- 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
+- Resolved: rhbz#580432
+
 * Tue Mar 30 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-37.b17
 - Added java-1.6.0-openjdk-securitypatches-20100323.patch
 - Added java-1.6.0-openjdk-linux-globals.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-13/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources	2 Mar 2010 14:12:22 -0000	1.73
+++ sources	5 May 2010 16:07:35 -0000	1.74
@@ -1,7 +1,10 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
-a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
-a6756a62291ebea5c0e2431389b31380  netbeans-profiler-visualvm_release65_mod.tar.gz
 a289739f4a5bcdb9a2c642cfcc1e83fe  visualvm-111-src.tar.gz
+a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
-078fe0ab744c98694decc77f2456c560  openjdk-6-src-b17-14_oct_2009.tar.gz
-40fb37998d40ee2c9aad6087348c6306  icedtea6-1.7.1.tar.gz
+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
+40dd3183b345737ca22162d164c2d5a2  netbeans-profiler-visualvm_release68.tar.gz