[java-1.7.0-openjdk/f18] - Updated to 2.3.7 icedtea7 tarball - Updated the 2.1.6 icedtea7 tarball for arm - Removed testing
jiri vanek
jvanek at fedoraproject.org
Wed Feb 20 07:55:48 UTC 2013
commit 9f967d72472f5550eb11a87752bdaf29e7ee408c
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Wed Feb 20 08:56:24 2013 +0100
- Updated to 2.3.7 icedtea7 tarball
- Updated the 2.1.6 icedtea7 tarball for arm
- Removed testing
- mauve was outdated and
- jtreg was icedtea relict
- Added java -Xshare:dump to post (see 513605) fo jitarchs
.gitignore | 2 +
java-1.7.0-openjdk.spec | 123 +-
mauve_tests | 2571 --------------------------
sec-2013-02-01-7201064.patch | 123 --
sec-2013-02-01-8005615-sync_with_jdk7u.patch | 21 -
sec-2013-02-01-8005615.patch | 531 ------
sources | 5 +-
7 files changed, 41 insertions(+), 3335 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4002744..8a8b80e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@
/openjdk-icedtea-2.3.5.tar.gz
/openjdk-icedtea-2.1.5.tar.gz
/openjdk-icedtea-2.3.6.tar.gz
+/openjdk-icedtea-2.1.6.tar.gz
+/openjdk-icedtea-2.3.7.tar.gz
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 07fd120..8dbc2f9 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -6,10 +6,7 @@
# If debug is 1, OpenJDK is built with all debug info present.
%global debug 0
-# If runtests is 0 test suites will not be run.
-%global runtests 0
-
-%global icedtea_version 2.3.6
+%global icedtea_version 2.3.7
%global hg_tag icedtea-{icedtea_version}
%global accessmajorver 1.23
@@ -17,7 +14,6 @@
%global accessver %{accessmajorver}.%{accessminorver}
%global accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
-%global mauvedate 2008-10-22
%global multilib_arches ppc64 sparc64 x86_64
@@ -153,7 +149,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}%{?dist}
+Release: %{icedtea_version}.0%{?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
@@ -173,7 +169,6 @@ URL: http://openjdk.java.net/
#head
#REPO=http://icedtea.classpath.org/hg/icedtea7-forest
#current release
-#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2
#REPO=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3
# hg clone $REPO/ openjdk -r %{hg_tag}
# hg clone $REPO/corba/ openjdk/corba -r %{hg_tag}
@@ -183,7 +178,6 @@ URL: http://openjdk.java.net/
# hg clone $REPO/jdk/ openjdk/jdk -r %{hg_tag}
# hg clone $REPO/langtools/ openjdk/langtools -r %{hg_tag}
# find openjdk -name ".hg" -exec rm -rf '{}' \;
-# DEPRECATED - find openjdk -name ".hgtags" -exec rm -rf '{}' \; - used for check of corect forest
# tar czf openjdk-icedtea-%{icedtea_version}.tar.gz openjdk
Source0: openjdk-icedtea-%{icedtea_version}.tar.gz
@@ -195,19 +189,9 @@ Source1: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2
# This source is under maintainer's/java-team's control
Source2: README.src
-# Mauve test suite
-# FIXME: Is this applicable for 7?
-# IMHO this should be removed, QA should run this tests in theirs most accurate version asynchronously/periodicaly
-# Source3 download is no longer possible. GNUclasspath maintainers are no longer supporting releases
-# To receive this tarball please follow http://sources.redhat.com/mauve/cvs.html (checkout cvs and tar.gz it)
-Source3: mauve-%{mauvedate}.tar.gz
-# This file is list of all tests which can be run.
-# It is outdated now. The complete list can be generated by `find ` in mauve/gnu/testlet, but omg (package) tests should be removed
-Source4: mauve_tests
-
# javac wrapper (used during bootstrap to strip what ecj doesn't support)
# This source is under manual control of maintainer/java-team
-Source5: javac-wrapper
+Source3: javac-wrapper
# Sources 6-12 are taken from hg clone http://icedtea.classpath.org/hg/icedtea7
@@ -218,37 +202,37 @@ Source5: javac-wrapper
# build OpenJDK7 tarball above with any JDK
# mv generated.build generated
# tar czf generated-files.tar.gz generated
-Source6: generated-files.tar.gz
+Source4: generated-files.tar.gz
# Class rewrite to rewrite rhino hierarchy
-Source7: class-rewriter.tar.gz
+Source5: class-rewriter.tar.gz
# Systemtap tapsets. Zipped up to keep it small.
-Source8: systemtap-tapset.tar.gz
+Source6: systemtap-tapset.tar.gz
# .desktop files. Zipped up to keep it small.
-Source9: desktop-files.tar.gz
+Source7: desktop-files.tar.gz
# nss configuration file
-Source10: nss.cfg
+Source8: nss.cfg
# FIXME: Taken from IcedTea snapshot 877ad5f00f69, but needs to be moved out
# hg clone -r 877ad5f00f69 http://icedtea.classpath.org/hg/icedtea7
-Source11: pulseaudio.tar.gz
+Source9: pulseaudio.tar.gz
# Removed libraries that we link instead
-Source12: remove-intree-libraries.sh
+Source10: remove-intree-libraries.sh
#This archive contains all temporal patches, which are or will be soon upstreamed,
#but were needed asap in distribution. Those parches are then applied in loop
-Source13: tmp-patches-java-1.7.0-openjdk-f17.tar.gz
+Source11: tmp-patches-java-1.7.0-openjdk-f17.tar.gz
# For primary arches, build latest and for secondary, use hs22
# base (icedtea-2.2.1 tag)
# http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1
# hg tag: icedtea-2.1.5
-Source100: openjdk-icedtea-2.1.5.tar.gz
+Source100: openjdk-icedtea-2.1.6.tar.gz
# RPM/distribution specific patches
@@ -453,13 +437,7 @@ BuildRequires: java-1.5.0-gcj-devel
%else
BuildRequires: java-1.7.0-openjdk-devel
%endif
-# Mauve build requirements.
-BuildRequires: xorg-x11-server-Xvfb
-BuildRequires: xorg-x11-fonts-Type1
-BuildRequires: xorg-x11-fonts-misc
-BuildRequires: freetype-devel >= 2.3.0
BuildRequires: fontconfig
-BuildRequires: ecj
# Java Access Bridge for GNOME build requirements.
BuildRequires: at-spi-devel
BuildRequires: gawk
@@ -602,11 +580,9 @@ The OpenJDK API documentation.
%endif
%setup -q -c -n %{name} -T -a %{source_num}
-%setup -q -n %{name} -T -D -a 3
%setup -q -n %{name} -T -D -a 1
-%setup -q -n %{name} -T -D -a 13
+%setup -q -n %{name} -T -D -a 11
cp %{SOURCE2} .
-cp %{SOURCE4} .
# OpenJDK patches
@@ -628,21 +604,21 @@ cp %{SOURCE4} .
%endif
# Remove libraries that are linked
-sh %{SOURCE12}
+sh %{SOURCE10}
# Copy jaxp, jaf and jaxws drops
mkdir drops/
# Extract the generated files
-tar xzf %{SOURCE6}
+tar xzf %{SOURCE4}
# Extract the rewriter (to rewrite rhino classes)
-tar xzf %{SOURCE7}
+tar xzf %{SOURCE5}
# Extract systemtap tapsets
%if %{with_systemtap}
-tar xzf %{SOURCE8}
+tar xzf %{SOURCE6}
for file in tapset/*.in; do
@@ -658,11 +634,11 @@ done
# Pulseaudio
%if %{with_pulseaudio}
-tar xzf %{SOURCE11}
+tar xzf %{SOURCE9}
%endif
# Extract desktop files
-tar xzf %{SOURCE9}
+tar xzf %{SOURCE7}
#apply all patches from tmp-patches
TMPPATCHES=`ls tmp-patches/` ;
@@ -675,6 +651,7 @@ for TP in $TMPPATCHES ; do
fi;
done ;
+
# If bootstrapping, apply additional patches
%if %{gcjbootstrap}
@@ -804,8 +781,8 @@ mkdir -p bootstrap/boot
cp -aL %{_jvmdir}/java-gcj/* bootstrap/boot/ || : # broken symlinks can be non-fatal but may cause this to fail
# Replace javac with a wrapper that does some magic
-cp -af %{SOURCE5} bootstrap/boot/bin/javac
-chmod u+x bootstrap/boot/bin/javac # SOURCE5 may not be +x
+cp -af %{SOURCE3} bootstrap/boot/bin/javac
+chmod u+x bootstrap/boot/bin/javac # SOURCE3 may not be +x
sed -i -e s:@RT_JAR@:$PWD/bootstrap/boot/jre/lib/rt.jar:g bootstrap/boot/bin/javac
# Link the native2ascii binary
@@ -973,39 +950,6 @@ popd
# Copy tz.properties
echo "sun.zoneinfo.dir=/usr/share/javazi" >> $JAVA_HOME/jre/lib/tz.properties
-%if %{runtests}
-# Run jtreg test suite.
-{
- echo ====================JTREG TESTING========================
- export DISPLAY=:20
- Xvfb :20 -screen 0 1x1x24 -ac&
- echo $! > Xvfb.pid
- make jtregcheck -k
- kill -9 `cat Xvfb.pid`
- unset DISPLAY
- rm -f Xvfb.pid
- echo ====================JTREG TESTING END====================
-} || :
-
-# Run Mauve test suite.
-{
- pushd mauve-%{mauvedate}
- ./configure
- make
- echo ====================MAUVE TESTING========================
- export DISPLAY=:20
- Xvfb :20 -screen 0 1x1x24 -ac&
- echo $! > Xvfb.pid
- $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java \
- -file %{SOURCE4} -timeout 30000 2>&1 | tee mauve_output
- kill -9 `cat Xvfb.pid`
- unset DISPLAY
- rm -f Xvfb.pid
- echo ====================MAUVE TESTING END====================
- popd
-} || :
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
STRIP_KEEP_SYMTAB=libjvm*
@@ -1105,7 +1049,7 @@ popd
# Install nss.cfg
-install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/
+install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/
# Install Javadoc documentation.
@@ -1164,6 +1108,11 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \
# FIXME: identical binaries are copied, not linked. This needs to be
# fixed upstream.
%post
+%ifarch %{jit_arches}
+#see https://bugzilla.redhat.com/show_bug.cgi?id=513605
+%{jrebindir}/java -Xshare:dump >/dev/null 2>/dev/null
+%endif
+
ext=.gz
alternatives \
--install %{_bindir}/java java %{jrebindir}/java %{priority} \
@@ -1460,12 +1409,6 @@ exit 0
%defattr(-,root,root,-)
%doc README.src
%{_jvmdir}/%{sdkdir}/src.zip
-%if %{runtests}
-# FIXME: put these in a separate testresults subpackage.
-%doc mauve_tests
-%doc mauve-%{mauvedate}/mauve_output
-%doc test/jtreg-summary.log
-%endif
%files javadoc
%defattr(-,root,root,-)
@@ -1473,7 +1416,15 @@ exit 0
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
%changelog
-* Thu Feb 14 2013 Deepak Bhole <dbhole at redhat.com> - 1.7.0.9-2.3.6.fc18
+* Fri Feb 16 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.9-2.3.7.fc18
+- Updated to 2.3.7 icedtea7 tarball
+- Updated the 2.1.6 icedtea7 tarball for arm
+- Removed testing
+ - mauve was outdated and
+ - jtreg was icedtea relict
+- Added java -Xshare:dump to post (see 513605) fo jitarchs
+
+* Thu Feb 14 2013 Deepak Bhole <dbhole at redhat.com> - 1.7.0.9-2.3.6.fc17
- Updated to 2.3.6
- Updated the 2.1.5 tarball
- Removed upstreamed patches
diff --git a/sources b/sources
index 4e2e02f..8a24f95 100644
--- a/sources
+++ b/sources
@@ -2,9 +2,8 @@ ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz
7df0a19525f26643d4cea3228fbbc6cc desktop-files.tar.gz
868ff2d4457d1a2dccfa465fb8220e1c generated-files.tar.gz
c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
-a9cdc5f050eb6e97c1b15ddd39978710 mauve-2008-10-22.tar.gz
1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz
8eb5ad93dbf2f4fe86e52631969cfb09 systemtap-tapset.tar.gz
c5e790214585959e0d9f51fb5d9e98c6 tmp-patches-java-1.7.0-openjdk-f17.tar.gz
-223b1d36e531757eb7ce3c9e516fe930 openjdk-icedtea-2.1.5.tar.gz
-5116987ba4587de04f7fe3ecc59ac09a openjdk-icedtea-2.3.6.tar.gz
+4b91ceff3ee6c3852d8a5af5a88b8fcd openjdk-icedtea-2.1.6.tar.gz
+98c912e0734c1bfe1558eb7cf6f569f5 openjdk-icedtea-2.3.7.tar.gz
More information about the scm-commits
mailing list