[java-1.6.0-openjdk] Sync with F14, update to 1.9.3
Deepak Bhole
dbhole at fedoraproject.org
Thu Jan 13 19:34:49 UTC 2011
commit 11a2e8b7299e50966e1f89eca236972322c674cc
Author: Deepak Bhole <dbhole at redhat.com>
Date: Thu Jan 13 14:33:20 2011 -0500
Sync with F14, update to 1.9.3
.gitignore | 9 +++++
java-1.6.0-openjdk.spec | 86 ++++++++++++++++++++++++++++++-----------------
sources | 13 +++----
3 files changed, 70 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aa216fc..f5d3016 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,12 @@ visualvm-111-src.tar.gz
java-access-bridge-1.23.0.tar.bz2
openjdk-6-src-b18-16_feb_2010-fedora.tar.gz
icedtea6-1.8.tar.gz
+/mauve_tests
+/mauve-2008-10-22.tar.gz
+/java-access-bridge-1.23.0.tar.bz2
+/openjdk-6-src-b20-21_jun_2010-fedora.tar.gz
+/jdk6-jaxp-b20.zip
+/jdk6-jaxws-b20.zip
+/jdk6-jaf-b20.zip
+/13edc857b967.tar.gz
+/icedtea6-1.9.3.tar.gz
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index 989b9e3..0913b13 100644
--- a/java-1.6.0-openjdk.spec
+++ b/java-1.6.0-openjdk.spec
@@ -6,10 +6,10 @@
# If runtests is 0 test suites will not be run.
%define runtests 0
-%define icedteaver 1.8
+%define icedteaver 1.9.3
%define icedteasnapshot %{nil}
-%define openjdkver b18
-%define openjdkdate 16_feb_2010
+%define openjdkver b20
+%define openjdkdate 21_jun_2010
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -18,10 +18,10 @@
%define accessver %{accessmajorver}.%{accessminorver}
%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
-
-%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127170/
-%define netbeansurl http://icedtea.classpath.org/visualvm/
-%define hotspoturl http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
+%define hotspoturl http://hg.openjdk.java.net/hsx/hsx19/master/archive/
+%define jaxpurl https://jaxp.dev.java.net/files/documents/913/150648/
+%define jafurl https://jax-ws.dev.java.net/files/documents/4202/150725/
+%define jaxwsurl https://jax-ws.dev.java.net/files/documents/4202/150724/
%define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/
%define openjdkurl %{openjdkurlbase}%{openjdkver}/
@@ -62,13 +62,13 @@
%define runtests 0
%endif
-%define buildoutputdir openjdk/build/linux-%{archbuild}
+%define buildoutputdir openjdk.build
%if %{gcjbootstrap}
%define icedteaopt %{nil}
%else
%ifarch %{jit_arches}
-%define icedteaopt --with-openjdk --enable-systemtap --enable-npplugin
+%define icedteaopt --with-openjdk --enable-systemtap
%else
%define icedteaopt --with-openjdk
%endif
@@ -137,7 +137,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 41.%{icedteaver}%{?dist}
+Release: 49.%{icedteaver}%{?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
@@ -160,8 +160,10 @@ Source3: %{genurl}generate-fedora-zip.sh
Source4: README.src
Source5: mauve-%{mauvedate}.tar.gz
Source6: mauve_tests
-Source7: %{netbeansurl}/netbeans-profiler-visualvm_release68_1.tar.gz
-Source8: %{visualvmurl}/visualvm_122-src.tar.gz
+Source7: %{hotspoturl}13edc857b967.tar.gz
+Source8: %{jaxpurl}jdk6-jaxp-%{openjdkver}.zip
+Source9: %{jafurl}jdk6-jaf-%{openjdkver}.zip
+Source10: %{jaxwsurl}jdk6-jaxws-%{openjdkver}.zip
# FIXME: This patch needs to be fixed. optflags argument
# -mtune=generic is being ignored because it breaks several graphical
# applications.
@@ -190,8 +192,10 @@ BuildRequires: xerces-j2
BuildRequires: xorg-x11-proto-devel
BuildRequires: mercurial
BuildRequires: ant
+BuildRequires: ant-nodeps
BuildRequires: libXinerama-devel
BuildRequires: rhino
+BuildRequires: libstdc++-static
%if %{gcjbootstrap}
BuildRequires: java-1.5.0-gcj-devel
%else
@@ -226,9 +230,6 @@ BuildRequires: libffi-devel
#systemtap build requirement.
BuildRequires: systemtap-sdt-devel
%endif
-# visualvm build requirements.
-BuildRequires: netbeans
-BuildRequires: jakarta-commons-logging
#fixing 648499
BuildRequires: redhat-lsb
@@ -285,8 +286,6 @@ Group: Development/Tools
# Require base package.
Requires: %{name} = %{epoch}:%{version}-%{release}
-# For visualvm
-Requires: netbeans-platform
# Post requires alternatives to install tool alternatives.
Requires(post): %{_sbindir}/alternatives
# Postun requires alternatives to uninstall tool alternatives.
@@ -383,8 +382,6 @@ The OpenJDK web browser plugin.
%patch0
cp %{SOURCE4} .
cp %{SOURCE6} .
-cp %{SOURCE7} .
-cp %{SOURCE8} .
%build
# Build IcedTea and OpenJDK.
@@ -397,7 +394,9 @@ export CFLAGS="$CFLAGS -mieee"
./autogen.sh
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
--with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
- --enable-visualvm \
+ --with-hotspot-build=hs19 --with-hotspot-src-zip=%{SOURCE7} \
+ --with-jaf-drop-zip=%{SOURCE9} \
+ --with-jaxp-drop-zip=%{SOURCE8} --with-jaxws-drop-zip=%{SOURCE10} \
--with-abs-install-dir=%{_jvmdir}/%{sdkdir}
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
@@ -524,10 +523,6 @@ pushd %{buildoutputdir}/j2sdk-image
ln -sf %{sdkdir} %{sdklnk}
popd
- # Remove javaws man page.
- #should not needed anymore
- #rm -f man/man1/javaws.1
-
# Install man pages.
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
for manpage in man/man1/*
@@ -563,8 +558,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install --vendor ''\
--dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
-desktop-file-install --vendor ''\
- --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
for e in jconsole policytool ; do
desktop-file-install --vendor=fedora --mode=644 \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
@@ -578,7 +571,7 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
# Find JRE files.
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
| grep -v jre/lib/security \
- | grep -v IcedTeaNPPlugin.so \
+ | grep -v IcedTeaPlugin.so \
| sed 's|'$RPM_BUILD_ROOT'||' \
>> %{name}.files
# Find demo directories.
@@ -628,6 +621,8 @@ alternatives \
--slave %{_bindir}/unpack200 unpack200 %{jrebindir}/unpack200 \
--slave %{_mandir}/man1/java.1$ext java.1$ext \
%{_mandir}/man1/java-%{name}.1$ext \
+ --slave %{_mandir}/man1/javaws.1$ext javaws.1$ext \
+ %{_mandir}/man1/javaws-%{name}.1$ext \
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \
%{_mandir}/man1/keytool-%{name}.1$ext \
--slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \
@@ -710,7 +705,6 @@ alternatives \
--slave %{_bindir}/jstack jstack %{sdkbindir}/jstack \
--slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \
--slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \
- --slave %{_bindir}/jvisualvm jvisualvm %{sdkbindir}/jvisualvm \
--slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \
--slave %{_bindir}/policytool policytool %{sdkbindir}/policytool \
--slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \
@@ -821,8 +815,8 @@ then
alternatives --remove %{javaplugin} \
%{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so 2>/dev/null
fi
-
-
+alternatives --remove %{javaplugin} \
+ %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so 2>/dev/null
alternatives \
--install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
%{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so %{priority}
@@ -862,6 +856,7 @@ exit 0
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%{_datadir}/icons/hicolor/*x*/apps/java.png
%{_mandir}/man1/java-%{name}.1*
+%{_mandir}/man1/javaws-%{name}.1*
%{_mandir}/man1/keytool-%{name}.1*
%{_mandir}/man1/orbd-%{name}.1*
%{_mandir}/man1/pack200-%{name}.1*
@@ -927,7 +922,6 @@ exit 0
%{_mandir}/man1/wsgen-%{name}.1*
%{_mandir}/man1/wsimport-%{name}.1*
%{_mandir}/man1/xjc-%{name}.1*
-%{_datadir}/applications/visualvm.desktop
%ifarch %{jit_arches}
%{tapsetdir}/*.stp
%endif
@@ -955,6 +949,36 @@ exit 0
%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
%changelog
+* Thu Jan 13 2011 Deepak Bhole <dbhole at redhat.com> - 1:1.6.0.0-49.1.9.3
+- Sync with F14 and rebuild for rawhide:
+ From Deepak Bhole <dbhole at redhat.com>:
+ - Updated to IcedTea 1.9.3
+ - Resolves: rhbz# 645843
+ - Resolves: rhbz# 647737
+ - Resolves: rhbz# 643674
+ - Remove patch that disabled Compressed Oops. It is now the default upstream.
+ - Added BR for libstdc++-static
+ - From Andrew Hughes (ahughes at redhat.com): Updated to IcedTea 1.9.1
+ - Sync with F13:
+ - Fixed plugin update to IcedTeaPlugin.so
+ - Fixed plugin cpu usage issue
+ - Fixed plugin rewrites ? in URL
+ - Resolves: rhbz#500077
+ - Resolves: rhbz#560193
+ - Resolves: rhbz#601281
+ - Resolves: rhbz#616893
+ - Resolves: rhbz#616895
+ - Resolves: rhbz#595191
+ - Resovles: rhbz#596850
+ - Resolves: rhbz#597134
+ - Resolves: rhbz#580432
+ - Resovles: rhbz#598353
+ - Resolves: rhbz#592553
+ - Resolves: rhbz#602906
+ From Jiri Vanek <jvanek at redhat.com>:
+ - Resolves: rhbz#657491
+ - Removed Asian and Indic font dependencies.
+ - added fonts dependencies
* Tue Nov 2 2010 Jiri Vanek <jvanek at redhat.com> -1:1.6.0-41.1.8
-fixing rhbz#648499 - BuildRequires: redhat-lsb
diff --git a/sources b/sources
index 7f34967..2a29d3f 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,9 @@
7a0c160c03012cd40957a7a112e25038 mauve_tests
a9cdc5f050eb6e97c1b15ddd39978710 mauve-2008-10-22.tar.gz
c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
-8605eab6f3b728939a0c689e51a2ba14 openjdk-6-src-b18-16_feb_2010-fedora.tar.gz
-e08dd0762749fb50ec6c273c366ee8ae icedtea6-1.8.tar.gz
-7a50bb540a27cdd0001885630088b758 jdk6-jaf-2009_10_27.zip
-a2f7b972124cd776ff71e7754eb9a429 jdk6-jaxp-2009_10_13.zip
-3ea5728706169498b722b898a1008acf jdk6-jaxws-2009_10_27.zip
-517b66f76914970569a8add1ee96bcaf netbeans-profiler-visualvm_release68_1.tar.gz
-f1e2525ddcd5fdf97bcf891d715c08ff visualvm_122-src.tar.gz
+843c656e5f891d9f5ebe1d530be4ce73 openjdk-6-src-b20-21_jun_2010-fedora.tar.gz
+22e95fbdb9fb7d8b6b6fc0a1d76d1fbd jdk6-jaxp-b20.zip
+91adfd41e6f001add4f92ae31216b1e3 jdk6-jaxws-b20.zip
+bc95c133620bd68c161cac9891592901 jdk6-jaf-b20.zip
+3171888f17698d8e9348f8b3e813d20d 13edc857b967.tar.gz
+2fe1d535d55f66d4c370eed1779c8b32 icedtea6-1.9.3.tar.gz
More information about the scm-commits
mailing list