rpms/java-1.6.0-openjdk/F-10 .cvsignore, 1.50, 1.51 java-1.6.0-openjdk-java-access-bridge-security.patch, 1.2, 1.3 java-1.6.0-openjdk.spec, 1.113, 1.114 sources, 1.56, 1.57 java-1.6.0-openjdk-makefile.patch, 1.12, NONE java-1.6.0-openjdk-netxandplugin.patch, 1.1, NONE java-1.6.0-openjdk-securitypatches.patch, 1.3, NONE
Lillian Angel
langel at fedoraproject.org
Thu Sep 10 15:51:45 UTC 2009
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16094
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:
ep 9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.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-10/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- .cvsignore 29 May 2009 13:57:35 -0000 1.50
+++ .cvsignore 10 Sep 2009 15:51:40 -0000 1.51
@@ -3,4 +3,4 @@ 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.5.tar.gz
+icedtea6-1.6.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-10/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:22:55 -0000 1.2
+++ java-1.6.0-openjdk-java-access-bridge-security.patch 10 Sep 2009 15:51:41 -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-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- java-1.6.0-openjdk.spec 5 Aug 2009 14:10:45 -0000 1.113
+++ java-1.6.0-openjdk.spec 10 Sep 2009 15:51:44 -0000 1.114
@@ -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
@@ -135,7 +135,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 20.%{openjdkver}%{?dist}
+Release: 21.%{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
@@ -164,14 +164,11 @@ Source7: %{hotspoturl}/hotspot.tar.gz
# 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)
@@ -382,8 +379,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} .
@@ -406,11 +402,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
@@ -418,7 +412,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
@@ -954,6 +948,13 @@ exit 0
%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
%changelog
+* Thu Sep 9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.b16
+- Removed unneeded patches.
+- Updated icedteaver to 1.6
+- Resolves: rhbz#484858
+- Resolves: rhbz#497408
+- Resolves: rhbz#489414
+
* Wed Aug 5 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-20.b16
- Updated java-1.6.0-openjdk-netx.patch, and renamed to
java-1.6.0-openjdk-netxandplugin.patch.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources 29 May 2009 13:57:35 -0000 1.56
+++ sources 10 Sep 2009 15:51:44 -0000 1.57
@@ -1,6 +1,5 @@
7a0c160c03012cd40957a7a112e25038 mauve_tests
1db4280d3228f20ad39ad22382ce2b00 java-access-bridge-1.23.0.tar.gz
a9cdc5f050eb6e97c1b15ddd39978710 mauve-2008-10-22.tar.gz
-dbd7aca5544d1aeebf0eadd45d29d08e hotspot.tar.gz
-547db20e170c2a2566a56455b196aef7 openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
-a67303675a53781c4e42bdb02ec78e40 icedtea6-1.5.tar.gz
+de61179beb105dcd5cbfbdc0dea43b8b icedtea6-1.6.tar.gz
+a18717b554f1788b08844bd63e262fd8 openjdk-6-src-b16-24_apr_2009-fedora.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 ---
More information about the fedora-extras-commits
mailing list