[java-1.6.0-openjdk/f16] sync with master
jiri vanek
jvanek at fedoraproject.org
Tue Jan 31 17:33:03 UTC 2012
commit ebddb8bb297fc2fa7afaa4e7970bd35d597692a4
Author: Jiri Vanek work <jvanek at judovana.home>
Date: Tue Jan 31 18:34:44 2012 +0100
sync with master
.gitignore | 5 +
glibc-name-clash.patch | 236 ---------------------------------------------
java-1.6.0-openjdk.spec | 44 +++++----
makefile-xalan-deps.patch | 11 --
sources | 9 +-
5 files changed, 33 insertions(+), 272 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a705dd3..ad79346 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,8 @@ icedtea6-1.8.tar.gz
/icedtea6-1.10.3.tar.gz
/icedtea6-1.10.4.tar.gz
/icedtea6-1.10.5.tar.gz
+/icedtea6-1.11pre.tar.gz
+/jaxp144_03.zip
+/jdk6-jaxws2_1_6-2011_06_13.zip
+/openjdk-6-src-b24-14_nov_2011-fedora.tar.gz
+/icedtea6-1.11.tar.gz
diff --git a/java-1.6.0-openjdk.spec b/java-1.6.0-openjdk.spec
index b22dd26..3bcafe2 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.10.5
+%define icedteaver 1.11
%define icedteasnapshot %{nil}
-%define openjdkver b22
-%define openjdkdate 28_feb_2011
+%define openjdkver b24
+%define openjdkdate 14_nov_2011
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -18,7 +18,6 @@
%define accessver %{accessmajorver}.%{accessminorver}
%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
-%define hotspoturl http://hg.openjdk.java.net/hsx/hsx20/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/
@@ -139,7 +138,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 62.%{icedteaver}%{?dist}
+Release: 63.%{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
@@ -162,10 +161,9 @@ Source3: %{genurl}generate-fedora-zip.sh
Source4: README.src
Source5: mauve-%{mauvedate}.tar.gz
Source6: mauve_tests
-Source7: %{hotspoturl}hotspot.tar.gz
-Source8: %{jaxpurl}jaxp144_01.zip
-Source9: %{jafurl}jdk6-jaf-b20.zip
-Source10: %{jaxwsurl}jdk6-jaxws-b20.zip
+Source7: %{jaxpurl}jaxp144_03.zip
+Source8: %{jafurl}jdk6-jaf-b20.zip
+Source9: %{jaxwsurl}jdk6-jaxws2_1_6-2011_06_13.zip
# FIXME: This patch needs to be fixed. optflags argument
# -mtune=generic is being ignored because it breaks several graphical
# applications.
@@ -174,8 +172,6 @@ Patch1: java-1.6.0-openjdk-java-access-bridge-tck.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: makefile-xalan-deps.patch
-Patch6: glibc-name-clash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -191,8 +187,9 @@ BuildRequires: libXtst-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: wget
-BuildRequires: xalan-j2
-BuildRequires: xerces-j2
+#BuildRequires: xalan-j2
+#BuildRequires: xerces-j2
+BuildRequires: libxslt
BuildRequires: xorg-x11-proto-devel
BuildRequires: mercurial
BuildRequires: ant
@@ -231,6 +228,8 @@ BuildRequires: systemtap-sdt-devel
#fixing 648499
BuildRequires: redhat-lsb
+#fix for rhbz721033
+Requires: xorg-x11-fonts-Type1
Requires: fontconfig
Requires: rhino
Requires: libjpeg = 6b
@@ -370,15 +369,11 @@ export ARCH_DATA_MODEL=64
export CFLAGS="$CFLAGS -mieee"
%endif
-patch -l -p0 < %{PATCH5}
-
./autogen.sh
-
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
--with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
- --with-hotspot-build=hs20 --with-hotspot-src-zip=%{SOURCE7} \
- --with-jaf-drop-zip=%{SOURCE9} \
- --with-jaxp-drop-zip=%{SOURCE8} --with-jaxws-drop-zip=%{SOURCE10} \
+ --with-jaf-drop-zip=%{SOURCE8} \
+ --with-jaxp-drop-zip=%{SOURCE7} --with-jaxws-drop-zip=%{SOURCE9} \
--with-abs-install-dir=%{_jvmdir}/%{sdkdir}
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
@@ -387,7 +382,6 @@ make stamps/patch-ecj.stamp
make patch
patch -l -p0 < %{PATCH3}
patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH6}
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -893,6 +887,16 @@ exit 0
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jan 31 2012 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-63.1.11
+- sync with master
+- IcedTea6 bumped to 1.11 release
+- full release info at:
+ http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-January/017060.html
+- removed and deleted patches:
+ patch5 makefile-xalan-deps.patch
+ patch6 glibc-name-clash.patch
+ all were upstreamed
+
* Tue Jan 24 2012 Jiri Vanek <jvanek at redhat.com> - 1:1.6.0.0-62.1.10.5
- updated to icedtea6 1.10.5
- Backports
diff --git a/sources b/sources
index b18390f..00d16fc 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,8 @@
7a0c160c03012cd40957a7a112e25038 mauve_tests
a9cdc5f050eb6e97c1b15ddd39978710 mauve-2008-10-22.tar.gz
c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
-3bb82df0931f791674875321f54140f3 openjdk-6-src-b22-28_feb_2011-fedora.tar.gz
-ef7a8b3624ea904bf584bc46d79b5e75 jaxp144_01.zip
-91adfd41e6f001add4f92ae31216b1e3 jdk6-jaxws-b20.zip
+10c1cea1d24c064572abfe9687567948 icedtea6-1.11.tar.gz
+9eea471ad474040265c688858fcf09aa jaxp144_03.zip
bc95c133620bd68c161cac9891592901 jdk6-jaf-b20.zip
-369ad745bf697d525d1a00fc09906829 hotspot.tar.gz
-e2316f463b5d9f53f8c5c9020f2a7e5a icedtea6-1.10.5.tar.gz
+8fd91b09b643a19a912b8a75e7a7a9d5 jdk6-jaxws2_1_6-2011_06_13.zip
+7ecb35d87da256e2d4510ce22f56a2bd openjdk-6-src-b24-14_nov_2011-fedora.tar.gz
\ No newline at end of file
More information about the scm-commits
mailing list