rpms/java-1.6.0-openjdk/F-9 generate-fedora-zip.sh, 1.3, 1.4 java-1.6.0-openjdk.spec, 1.42, 1.43 sources, 1.27, 1.28 java-1.6.0-openjdk-makefile.patch, 1.3, NONE
Thomas Fitzsimmons (fitzsim)
fedora-extras-commits at redhat.com
Fri May 30 22:46:09 UTC 2008
Author: fitzsim
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19773/F-9
Modified Files:
generate-fedora-zip.sh java-1.6.0-openjdk.spec sources
Removed Files:
java-1.6.0-openjdk-makefile.patch
Log Message:
* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
- Remove makefile patch.
- Update generate-fedora-zip.sh.
Index: generate-fedora-zip.sh
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/generate-fedora-zip.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- generate-fedora-zip.sh 5 May 2008 14:21:32 -0000 1.3
+++ generate-fedora-zip.sh 30 May 2008 22:42:41 -0000 1.4
@@ -1,10 +1,10 @@
#!/bin/sh
-# Untar openjdk source zip.
+# Untar openjdk source tarball.
mkdir openjdk
-tar xf $1 -C openjdk
+tar xzf $1 -C openjdk
-# Remove binaries
+# Remove binaries.
rm -f \
openjdk/jdk/test/sun/management/windows/revokeall.exe \
openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
@@ -20,49 +20,50 @@
# 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 zip with new name.
-NEW_ZIP=$(echo $1 | sed -e 's/\.tar.gz/-fedora.tar.gz/')
-tar czf $NEW_ZIP openjdk/*
+# Create new tarball with new name.
+pushd openjdk > /dev/null
+ tar czf ../$(basename $1 .tar.gz)-fedora.tar.gz *
+popd > /dev/null
# Remove old unzipped openjdk dir.
rm -rf openjdk
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- java-1.6.0-openjdk.spec 30 May 2008 22:15:46 -0000 1.42
+++ java-1.6.0-openjdk.spec 30 May 2008 22:42:41 -0000 1.43
@@ -139,11 +139,10 @@
# -mtune=generic is being ignored because it breaks several graphical
# applications.
Patch0: java-1.6.0-openjdk-optflags.patch
-Patch1: java-1.6.0-openjdk-makefile.patch
# FIXME: The licenses in the jhat sources need to be fixed with proper
# GPL headers.
-Patch2: java-1.6.0-openjdk-jhat.patch
-Patch3: java-1.6.0-openjdk-java-access-bridge-tck.patch
+Patch1: java-1.6.0-openjdk-jhat.patch
+Patch2: java-1.6.0-openjdk-java-access-bridge-tck.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -338,7 +337,6 @@
%setup -q -n icedtea6-%{icedteaver} -T -D -a 6
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
%patch0
-%patch1
cp %{SOURCE4} .
cp %{SOURCE5} .
cp %{SOURCE7} .
@@ -349,18 +347,18 @@
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
pushd openjdk-ecj
- patch -l -p1 < %{PATCH2}
+ patch -l -p1 < %{PATCH1}
popd
%endif
make stamps/patch.stamp
-patch -l -p0 < %{PATCH2}
+patch -l -p0 < %{PATCH1}
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
# Build Java Access Bridge for GNOME.
pushd java-access-bridge-%{accessver}
- patch -l -p1 < %{PATCH3}
+ patch -l -p1 < %{PATCH2}
OLD_PATH=$PATH
export PATH=$JAVA_HOME/bin:$OLD_PATH
./configure
@@ -882,6 +880,10 @@
%changelog
* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Remove makefile patch.
+- Update generate-fedora-zip.sh.
+
+* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
- Formatting cleanups.
* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources 30 May 2008 22:15:46 -0000 1.27
+++ sources 30 May 2008 22:42:41 -0000 1.28
@@ -2,4 +2,4 @@
11d8e6129f27792cc1b0e1a7de2ec127 java-access-bridge-1.22.0.tar.gz
079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz
7a0c160c03012cd40957a7a112e25038 mauve_tests
-77f6e5b946c9c28c208b70cde372479f openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
+0a50744f931b235e7e20b755b35a41be openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
--- java-1.6.0-openjdk-makefile.patch DELETED ---
More information about the fedora-extras-commits
mailing list