rpms/java-1.6.0-openjdk/F-10 .cvsignore, 1.51, 1.52 java-1.6.0-openjdk.spec, 1.117, 1.118 sources, 1.58, 1.59

[Martin Matejovic]

Author: mmatejov

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27633

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Log Message:
* Mon Feb 1 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-24.b17
- Added icedtea6-1.7
- Added openjdk b17
- Removed hotspot tarball
- Removed: java-1.6.0-openjdk-netbeans.patch
- Removed: java-1.6.0-openjdk-securitypatches-20091103.patch
- Removed: java-1.6.0-openjdk-sparc-fixes.patch
- Removed: java-1.6.0-openjdk-sparc-hotspot.patch
- Removed: java-1.6.0-openjdk-x11.patch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- .cvsignore	10 Sep 2009 15:51:40 -0000	1.51
+++ .cvsignore	3 Feb 2010 08:13:36 -0000	1.52
@@ -2,5 +2,5 @@ mauve_tests
 java-access-bridge-1.23.0.tar.gz
 mauve-2008-10-22.tar.gz
 hotspot.tar.gz
-openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
-icedtea6-1.6.tar.gz
+icedtea6-1.7.tar.gz
+openjdk-6-src-b17-14_oct_2009.tar.gz


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- java-1.6.0-openjdk.spec	12 Nov 2009 14:30:31 -0000	1.117
+++ java-1.6.0-openjdk.spec	3 Feb 2010 08:13:36 -0000	1.118
@@ -6,10 +6,10 @@
 # If runtests is 0 test suites will not be run.
 %define runtests 1
 
-%define icedteaver 1.6
+%define icedteaver 1.7
 %define icedteasnapshot %{nil}
-%define openjdkver b16
-%define openjdkdate 24_apr_2009
+%define openjdkver b17
+%define openjdkdate 14_oct_2009
 
 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
 
@@ -18,11 +18,10 @@
 %define accessver %{accessmajorver}.%{accessminorver}
 %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
-%define hotspoturl  http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
-%define fedorazip  openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz
+%define fedorazip  openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz
 
 %define mauvedate 2008-10-22
 
@@ -135,7 +134,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 23.%{openjdkver}%{?dist}
+Release: 24.%{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
@@ -158,7 +157,6 @@ Source3:  %{genurl}generate-fedora-zip.s
 Source4:  README.src
 Source5:  mauve-%{mauvedate}.tar.gz
 Source6:  mauve_tests
-Source7: %{hotspoturl}/hotspot.tar.gz
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -167,9 +165,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-sparc-fixes.patch
-Patch6:   java-1.6.0-openjdk-sparc-hotspot.patch
-Patch7:   java-1.6.0-openjdk-securitypatches-20091103.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -380,10 +375,8 @@ 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 -p1
 cp %{SOURCE4} .
 cp %{SOURCE6} .
-cp %{SOURCE7} .
 
 %build
 # Build IcedTea and OpenJDK.
@@ -396,7 +389,6 @@ export CFLAGS="$CFLAGS -mieee"
 ./autogen.sh
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
   --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
-  --with-hotspot-src-zip=%{SOURCE7} \
   --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
 
 %if %{gcjbootstrap}
@@ -405,8 +397,6 @@ make stamps/patch-ecj.stamp
 make patch
 patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH6}
-patch -l -p0 < %{PATCH7}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -839,7 +829,6 @@ exit 0
 %defattr(-,root,root,-)
 %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
-%doc %{buildoutputdir}/j2sdk-image/jre/README.html
 %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README
 # FIXME: The TRADEMARK file should be in j2sdk-image.
 %doc openjdk/TRADEMARK
@@ -874,7 +863,6 @@ exit 0
 %defattr(-,root,root,-)
 %doc %{buildoutputdir}/j2sdk-image/ASSEMBLY_EXCEPTION
 %doc %{buildoutputdir}/j2sdk-image/LICENSE
-%doc %{buildoutputdir}/j2sdk-image/README.html
 %doc %{buildoutputdir}/j2sdk-image/THIRD_PARTY_README
 # FIXME: The TRADEMARK file should be in j2sdk-image.
 %doc openjdk/TRADEMARK
@@ -950,6 +938,16 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Mon Feb 1 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-24.b17
+- Added icedtea6-1.7
+- Added openjdk b17
+- Removed hotspot tarball
+- Removed: java-1.6.0-openjdk-netbeans.patch
+- Removed: java-1.6.0-openjdk-securitypatches-20091103.patch
+- Removed: java-1.6.0-openjdk-sparc-fixes.patch
+- Removed: java-1.6.0-openjdk-sparc-hotspot.patch
+- Removed: java-1.6.0-openjdk-x11.patch
+
 * Thu Nov 12 2009 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-23.b16
 - Updated release tag
 - Fixed applying patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- sources	10 Sep 2009 15:54:21 -0000	1.58
+++ sources	3 Feb 2010 08:13:36 -0000	1.59
@@ -1,6 +1,7 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
-1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
-de61179beb105dcd5cbfbdc0dea43b8b  icedtea6-1.6.tar.gz
-a18717b554f1788b08844bd63e262fd8  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
-600284e870609a7531163bf2972c573b  hotspot.tar.gz
+a6756a62291ebea5c0e2431389b31380  netbeans-profiler-visualvm_release65_mod.tar.gz
+a289739f4a5bcdb9a2c642cfcc1e83fe  visualvm-111-src.tar.gz
+56dce477d8363db4e20199990167ff06  icedtea6-1.7.tar.gz
+078fe0ab744c98694decc77f2456c560  openjdk-6-src-b17-14_oct_2009.tar.gz
+1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz