rpms/java-1.6.0-openjdk/devel .cvsignore, 1.34, 1.35 generate-fedora-zip.sh, 1.4, 1.5 java-1.6.0-openjdk-makefile.patch, 1.5, 1.6 java-1.6.0-openjdk.spec, 1.60, 1.61 sources, 1.34, 1.35
Lillian Angel (langel)
fedora-extras-commits at redhat.com
Wed Jul 16 15:27:21 UTC 2008
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30900
Modified Files:
.cvsignore generate-fedora-zip.sh
java-1.6.0-openjdk-makefile.patch java-1.6.0-openjdk.spec
sources
Log Message:
* Wed Jul 16 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
- Updated icedteasnapshot.
- Updated openjdkver.
- Updated openjdkdate.
- Updated generate-fedora-zip.sh
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore 15 Jul 2008 20:10:26 -0000 1.34
+++ .cvsignore 16 Jul 2008 15:26:27 -0000 1.35
@@ -1,5 +1,5 @@
mauve-2008-03-11.tar.gz
mauve_tests
-openjdk-6-src-b10_30_may_2008-fedora.tar.gz
java-access-bridge-1.23.0.tar.gz
-icedtea6-1.3-5a7febd10bf2b55cc4d13eaa09ac0c09916217a0.tar.gz
+icedtea6-1.3-2f1e7255ab4d2861a5796c461df71b014ee84f4f.tar.gz
+openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
Index: generate-fedora-zip.sh
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/generate-fedora-zip.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- generate-fedora-zip.sh 30 May 2008 22:43:39 -0000 1.4
+++ generate-fedora-zip.sh 16 Jul 2008 15:26:28 -0000 1.5
@@ -4,61 +4,80 @@
mkdir openjdk
tar xzf $1 -C openjdk
-# Remove binaries.
+# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
+# Sx denotes bug x in the Sun bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
+
+# PR146/S6713083
+# Remove binaries
rm -f \
openjdk/jdk/test/sun/management/windows/revokeall.exe \
openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
-# Remove idl sources with questionable license headers.
rm -f \
- openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl \
- openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/first.set \
- openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl \
- openjdk/corba/src/share/classes/com/sun/tools/corba/se/idl/follow.set
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
+
+rm -f \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
# Remove test sources with questionable license headers.
rm -f \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
- openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
- openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
- openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
- openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
- openjdk/jdk/test/java/util/Locale/LocaleTest.java \
- openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
- openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
- openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
+ openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
+ openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
+ openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTest.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
+ openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
+ openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
# Remove J2DBench sources, some of which have questionable license
# headers.
rm -rf \
- openjdk/jdk/src/share/demo/java2d/J2DBench/
+ openjdk/jdk/src/share/demo/java2d/J2DBench
+
# Create new tarball with new name.
pushd openjdk > /dev/null
java-1.6.0-openjdk-makefile.patch:
Index: java-1.6.0-openjdk-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-makefile.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- java-1.6.0-openjdk-makefile.patch 15 Jul 2008 17:08:51 -0000 1.5
+++ java-1.6.0-openjdk-makefile.patch 16 Jul 2008 15:26:28 -0000 1.6
@@ -1,6 +1,6 @@
---- oldMakefile.am 2008-07-15 11:28:34.000000000 -0400
-+++ Makefile.am 2008-07-15 12:50:40.000000000 -0400
-@@ -444,7 +444,6 @@
+--- oldMakefile.am 2008-07-16 10:09:49.000000000 -0400
++++ Makefile.am 2008-07-16 11:23:36.000000000 -0400
+@@ -436,7 +436,6 @@
mkdir openjdk ; \
$(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
chmod -R ug+w openjdk ; \
@@ -8,17 +8,17 @@
fi
if WITH_CACAO
if !USE_SYSTEM_CACAO
-@@ -466,7 +465,7 @@
+@@ -458,7 +457,7 @@
clean-extract:
rm -f stamps/extract.stamp
-stamps/patch.stamp: stamps/patch-fsg.stamp
+stamps/patch.stamp: stamps/extract.stamp
- rm -f stamps/patch.stamp.tmp
mkdir -p stamps ; \
- all_patches_ok=yes; \
---- oldMakefile.in 2008-07-15 11:29:18.000000000 -0400
-+++ Makefile.in 2008-07-15 12:50:52.000000000 -0400
+ rm -f stamps/patch.stamp.tmp ; \
+ touch stamps/patch.stamp.tmp ; \
+--- oldMakefile.in 2008-07-16 10:10:02.000000000 -0400
++++ Makefile.in 2008-07-16 11:24:00.000000000 -0400
@@ -91,6 +91,7 @@
ALSA_LIBS = @ALSA_LIBS@
ALT_CACAO_SRC_ZIP = @ALT_CACAO_SRC_ZIP@
@@ -27,7 +27,7 @@
AMTAR = @AMTAR@
ANT = @ANT@
AUTOCONF = @AUTOCONF@
-@@ -921,7 +922,6 @@
+@@ -911,7 +912,6 @@
mkdir openjdk ; \
$(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
chmod -R ug+w openjdk ; \
@@ -35,12 +35,12 @@
fi
@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ if ! test -d cacao ; \
@USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ then \
-@@ -939,7 +939,7 @@
+@@ -929,7 +929,7 @@
clean-extract:
rm -f stamps/extract.stamp
-stamps/patch.stamp: stamps/patch-fsg.stamp
+stamps/patch.stamp: stamps/extract.stamp
- rm -f stamps/patch.stamp.tmp
mkdir -p stamps ; \
- all_patches_ok=yes; \
+ rm -f stamps/patch.stamp.tmp ; \
+ touch stamps/patch.stamp.tmp ; \
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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- java-1.6.0-openjdk.spec 15 Jul 2008 20:10:26 -0000 1.60
+++ java-1.6.0-openjdk.spec 16 Jul 2008 15:26:28 -0000 1.61
@@ -7,9 +7,9 @@
%define runtests 1
%define icedteaver 1.3
-%define icedteasnapshot -5a7febd10bf2b55cc4d13eaa09ac0c09916217a0
-%define openjdkver b10
-%define openjdkdate 30_may_2008
+%define icedteasnapshot -2f1e7255ab4d2861a5796c461df71b014ee84f4f
+%define openjdkver b11
+%define openjdkdate 10_jul_2008
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -20,7 +20,7 @@
%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}-fedora.tar.gz
%define mauvedate 2008-03-11
@@ -888,6 +888,12 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
%changelog
+* Wed Jul 16 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
+- Updated icedteasnapshot.
+- Updated openjdkver.
+- Updated openjdkdate.
+- Updated generate-fedora-zip.sh
+
* Tue Jul 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
- Updated accessver to 1.23.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 15 Jul 2008 20:10:26 -0000 1.34
+++ sources 16 Jul 2008 15:26:28 -0000 1.35
@@ -1,5 +1,5 @@
079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz
7a0c160c03012cd40957a7a112e25038 mauve_tests
-5a8537503058edaeff587d45fc167631 openjdk-6-src-b10_30_may_2008-fedora.tar.gz
1db4280d3228f20ad39ad22382ce2b00 java-access-bridge-1.23.0.tar.gz
-7a6f293f8a2b878d08bc77dd7854bcb6 icedtea6-1.3-5a7febd10bf2b55cc4d13eaa09ac0c09916217a0.tar.gz
+26e06919efa3feedfb4e5520d4b42299 icedtea6-1.3-2f1e7255ab4d2861a5796c461df71b014ee84f4f.tar.gz
+0997dea46b42ed9bbebff8cbe5f70aa0 openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
More information about the scm-commits
mailing list