rpms/java-1.6.0-openjdk/F-11 .cvsignore, 1.57, 1.58 java-1.6.0-openjdk-java-access-bridge-security.patch, 1.2, 1.3 java-1.6.0-openjdk.spec, 1.127, 1.128 sources, 1.64, 1.65 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/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20818

Modified Files:
	.cvsignore 
	java-1.6.0-openjdk-java-access-bridge-security.patch 
	java-1.6.0-openjdk.spec sources 
Removed Files:
	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-29.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/F-11/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- .cvsignore	29 May 2009 14:05:20 -0000	1.57
+++ .cvsignore	10 Sep 2009 16:01:24 -0000	1.58
@@ -1,8 +1,8 @@
 mauve_tests
 java-access-bridge-1.23.0.tar.gz
 mauve-2008-10-22.tar.gz
-icedtea6-1.5.tar.gz
-hotspot.tar.gz
 netbeans-profiler-visualvm_release65_mod.tar.gz
 openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
 visualvm-111-src.tar.gz
+icedtea6-1.6.tar.gz
+hotspot.tar.gz

java-1.6.0-openjdk-java-access-bridge-security.patch:
 java.security |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: java-1.6.0-openjdk-java-access-bridge-security.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/java-1.6.0-openjdk-java-access-bridge-security.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- java-1.6.0-openjdk-java-access-bridge-security.patch	23 Jan 2009 17:24:44 -0000	1.2
+++ java-1.6.0-openjdk-java-access-bridge-security.patch	10 Sep 2009 16:01:24 -0000	1.3
@@ -4,8 +4,8 @@
  # passed to checkPackageAccess unless the
  # corresponding RuntimePermission ("accessClassInPackage."+package) has
  # been granted.
--package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
-+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
+-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.
++package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,com.sun.imageio.,org.GNOME.Accessibility.,org.GNOME.Bonobo.
  
  #
  # List of comma-separated packages that start with or equal this string


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.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- java-1.6.0-openjdk.spec	9 Sep 2009 14:12:06 -0000	1.127
+++ java-1.6.0-openjdk.spec	10 Sep 2009 16:01:29 -0000	1.128
@@ -6,7 +6,7 @@
 # If runtests is 0 test suites will not be run.
 %define runtests 1
 
-%define icedteaver 1.5
+%define icedteaver 1.6
 %define icedteasnapshot %{nil}
 %define openjdkver b16
 %define openjdkdate 24_apr_2009
@@ -138,7 +138,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 28.%{openjdkver}%{?dist}
+Release: 29.%{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
@@ -169,14 +169,11 @@ 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-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
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -392,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} .
@@ -417,11 +413,9 @@ 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}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -429,7 +423,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
@@ -969,6 +963,13 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Sep  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-29.b16
+- Removed unneeded patches.
+- Updated icedteaver to 1.6
+- Resolves: rhbz#484858
+- Resolves: rhbz#497408
+- Resolves: rhbz#489414
+
 * Wed Sep 09 2009 Jan Horak <jhorak at redhat.com> - 1:1.6.0.0-28.b16
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-11/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- sources	29 May 2009 14:05:20 -0000	1.64
+++ sources	10 Sep 2009 16:01:30 -0000	1.65
@@ -1,8 +1,8 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 1db4280d3228f20ad39ad22382ce2b00  java-access-bridge-1.23.0.tar.gz
 a9cdc5f050eb6e97c1b15ddd39978710  mauve-2008-10-22.tar.gz
-a67303675a53781c4e42bdb02ec78e40  icedtea6-1.5.tar.gz
-dbd7aca5544d1aeebf0eadd45d29d08e  hotspot.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
+a18717b554f1788b08844bd63e262fd8  openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
+de61179beb105dcd5cbfbdc0dea43b8b  icedtea6-1.6.tar.gz
+600284e870609a7531163bf2972c573b  hotspot.tar.gz


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


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


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