rpms/java-1.6.0-openjdk/devel .cvsignore, 1.60, 1.61 java-1.6.0-openjdk.spec, 1.133, 1.134 sources, 1.67, 1.68 java-1.6.0-openjdk-execvpe.patch, 1.1, NONE java-1.6.0-openjdk-makefile.patch, 1.13, NONE java-1.6.0-openjdk-netxandplugin.patch, 1.1, NONE java-1.6.0-openjdk-securitypatches.patch, 1.3, NONE

[Lillian Angel]

Author: langel

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

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Removed Files:
	java-1.6.0-openjdk-execvpe.patch 
	java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk-netxandplugin.patch 
	java-1.6.0-openjdk-securitypatches.patch 
Log Message:
* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-30.b16
- Removed unneeded patches.
- Updated icedteaver to 1.6
- Resolves: rhbz#484858
- Resolves: rhbz#497408
- Resolves: rhbz#489414




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- .cvsignore	10 Aug 2009 11:18:41 -0000	1.60
+++ .cvsignore	10 Sep 2009 16:12:06 -0000	1.61
@@ -4,5 +4,5 @@ netbeans-profiler-visualvm_release65_mod
 openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
 visualvm-111-src.tar.gz
 hotspot.tar.gz
-icedtea6-1.5.tar.gz
 java-access-bridge-1.23.0.tar.bz2
+icedtea6-1.6.tar.gz


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- java-1.6.0-openjdk.spec	10 Aug 2009 11:18:41 -0000	1.133
+++ java-1.6.0-openjdk.spec	10 Sep 2009 16:12:08 -0000	1.134
@@ -137,7 +137,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 29.%{openjdkver}%{?dist}
+Release: 30.%{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
@@ -168,16 +168,12 @@ Source9: %{visualvmurl}/visualvm-111-src
 # applications.
 Patch0:   java-1.6.0-openjdk-optflags.patch
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
-Patch2:   java-1.6.0-openjdk-makefile.patch
-Patch3:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
-Patch4:	  java-1.6.0-openjdk-java-access-bridge-security.patch
-Patch5:   java-1.6.0-openjdk-accessible-toolkit.patch
-Patch6:   java-1.6.0-openjdk-sparc-fixes.patch
-Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
-Patch8:	  java-1.6.0-openjdk-netxandplugin.patch
-Patch9:   java-1.6.0-openjdk-execvpe.patch
-Patch10:  java-1.6.0-openjdk-x11.patch
-Patch11:  java-1.6.0-openjdk-securitypatches.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:   java-1.6.0-openjdk-sparc-fixes.patch
+Patch6:   java-1.6.0-openjdk-sparc-hotspot.patch
+Patch7:   java-1.6.0-openjdk-x11.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -393,8 +389,7 @@ The OpenJDK web browser plugin.
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 5
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
-%patch2
-%patch6 -p1
+%patch5 -p1
 cp %{SOURCE4} .
 cp %{SOURCE6} .
 cp %{SOURCE7} .
@@ -418,13 +413,11 @@ export CFLAGS="$CFLAGS -mieee"
 make stamps/patch-ecj.stamp
 %endif
 make patch
+patch -l -p0 < %{PATCH3}
 patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH5}
-patch -l -p0 < %{PATCH7}
-patch -l -p0 < %{PATCH8}
-patch -l -p0 < %{PATCH9}
+patch -l -p0 < %{PATCH6}
 patch -l -p0 < %{PATCH10}
-patch -l -p0 < %{PATCH11}
+patch -l -p0 < %{PATCH7}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -432,7 +425,7 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir
 # Build Java Access Bridge for GNOME.
 pushd java-access-bridge-%{accessver}
   patch -l -p1 < %{PATCH1}
-  patch -l -p1 < %{PATCH3}
+  patch -l -p1 < %{PATCH2}
   OLD_PATH=$PATH
   export PATH=$JAVA_HOME/bin:$OLD_PATH
   ./configure
@@ -972,6 +965,13 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-30.b16
+- Removed unneeded patches.
+- Updated icedteaver to 1.6
+- Resolves: rhbz#484858
+- Resolves: rhbz#497408
+- Resolves: rhbz#489414
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.6.0-29.b16
 - Use bzipped java-access-bridge tarball.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	10 Aug 2009 11:18:41 -0000	1.67
+++ sources	10 Sep 2009 16:12:08 -0000	1.68
@@ -1,8 +1,8 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
 a6756a62291ebea5c0e2431389b31380  netbeans-profiler-visualvm_release65_mod.tar.gz
-547db20e170c2a2566a56455b196aef7  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
 a289739f4a5bcdb9a2c642cfcc1e83fe  visualvm-111-src.tar.gz
-dbd7aca5544d1aeebf0eadd45d29d08e  hotspot.tar.gz
-a67303675a53781c4e42bdb02ec78e40  icedtea6-1.5.tar.gz
 c12f124672a97c7491530fed2c0facdc  java-access-bridge-1.23.0.tar.bz2
+600284e870609a7531163bf2972c573b  hotspot.tar.gz
+a18717b554f1788b08844bd63e262fd8  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
+de61179beb105dcd5cbfbdc0dea43b8b  icedtea6-1.6.tar.gz


--- java-1.6.0-openjdk-execvpe.patch DELETED ---


--- java-1.6.0-openjdk-makefile.patch DELETED ---


--- java-1.6.0-openjdk-netxandplugin.patch DELETED ---


--- java-1.6.0-openjdk-securitypatches.patch DELETED ---