diff --git a/.gitignore b/.gitignore index 76f2656..66dce17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/icedtea6-1.13.4.tar.gz +SOURCES/icedtea6-1.13.5.tar.xz SOURCES/java-access-bridge-1.23.0.tar.bz2 -SOURCES/openjdk-6-src-b32-15_jul_2014-rhel.tar.gz +SOURCES/openjdk-6-src-b33-14_oct_2014-rhel.tar.xz diff --git a/.java-1.6.0-openjdk.metadata b/.java-1.6.0-openjdk.metadata index 283f7bc..8182aac 100644 --- a/.java-1.6.0-openjdk.metadata +++ b/.java-1.6.0-openjdk.metadata @@ -1,3 +1,3 @@ -f7722ca7d26e31d313c375c4b47176a1dfc163a1 SOURCES/icedtea6-1.13.4.tar.gz +14a31346a016e01140266c2ce90e387cbbfd455d SOURCES/icedtea6-1.13.5.tar.xz aa2c61cc73bad1e1a09e8843f341270f70921dbf SOURCES/java-access-bridge-1.23.0.tar.bz2 -6b53f67be1196a1bb25bd7c3c42215587610cf63 SOURCES/openjdk-6-src-b32-15_jul_2014-rhel.tar.gz +2a025c0f92682b82ede2630b3391034670cf1cf7 SOURCES/openjdk-6-src-b33-14_oct_2014-rhel.tar.xz diff --git a/SOURCES/generate-rhel-zip.sh b/SOURCES/generate-rhel-zip.sh index 0aa7970..b05d12f 100644 --- a/SOURCES/generate-rhel-zip.sh +++ b/SOURCES/generate-rhel-zip.sh @@ -2,7 +2,7 @@ # Untar openjdk source tarball. mkdir openjdk -tar xzf $1 -C openjdk +tar xJf $1 -C openjdk # 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) @@ -81,7 +81,7 @@ rm -rf \ # Create new tarball with new name. pushd openjdk > /dev/null - tar czf ../$(basename $1 .tar.gz)-rhel.tar.gz * + tar cJf ../$(basename $1 .tar.xz)-rhel.tar.xz * popd > /dev/null # Remove old unzipped openjdk dir. diff --git a/SOURCES/rh1115580-unsyncHashMap.patch b/SOURCES/rh1115580-unsyncHashMap.patch deleted file mode 100644 index ebddc2c..0000000 --- a/SOURCES/rh1115580-unsyncHashMap.patch +++ /dev/null @@ -1,57 +0,0 @@ -# HG changeset patch -# User vkarnauk -# Date 1340286118 -14400 -# Thu Jun 21 17:41:58 2012 +0400 -# Node ID f71b6117fd7bbb13ed4c1f68ace873695edd49cb -# Parent 762ae4a20c8b115e5cb486c5204d8bdee747ee59 -7027300: Unsynchronized HashMap access causes endless loop -Reviewed-by: bae, prr - -diff -r 762ae4a20c8b -r f71b6117fd7b src/share/classes/sun/font/SunLayoutEngine.java ---- openjdk/jdk/src/share/classes/sun/font/SunLayoutEngine.java Thu Jun 21 14:19:12 2012 +0400 -+++ openjdk/jdk/src/share/classes/sun/font/SunLayoutEngine.java Thu Jun 21 17:41:58 2012 +0400 -@@ -33,7 +33,7 @@ - import sun.font.GlyphLayout.*; - import java.awt.geom.Point2D; - import java.lang.ref.SoftReference; --import java.util.HashMap; -+import java.util.concurrent.ConcurrentHashMap; - import java.util.Locale; - - /* -@@ -129,9 +129,9 @@ - - // !!! don't need this unless we have more than one sun layout engine... - public LayoutEngine getEngine(LayoutEngineKey key) { -- HashMap cache = (HashMap)cacheref.get(); -+ ConcurrentHashMap cache = (ConcurrentHashMap)cacheref.get(); - if (cache == null) { -- cache = new HashMap(); -+ cache = new ConcurrentHashMap(); - cacheref = new SoftReference(cache); - } - -# HG changeset patch -# User prr -# Date 1342804653 25200 -# Fri Jul 20 10:17:33 2012 -0700 -# Node ID 84d5cdbe7bce2caf907ec842ac7b4fa2097fb295 -# Parent bf5bf37108c14d1d01b8a1043f9e3ff0e3727869 -7183251: Netbeans editor renders text wrong on JDK 7u6 build -Reviewed-by: igor, jgodinez - -diff -r bf5bf37108c1 -r 84d5cdbe7bce src/share/classes/sun/font/SunLayoutEngine.java ---- openjdk/jdk/src/share/classes/sun/font/SunLayoutEngine.java Fri Jul 20 13:58:52 2012 +0400 -+++ openjdk/jdk/src/share/classes/sun/font/SunLayoutEngine.java Fri Jul 20 10:17:33 2012 -0700 -@@ -137,8 +137,9 @@ - - LayoutEngine e = (LayoutEngine)cache.get(key); - if (e == null) { -- e = new SunLayoutEngine(key.copy()); -- cache.put(key, e); -+ LayoutEngineKey copy = key.copy(); -+ e = new SunLayoutEngine(copy); -+ cache.put(copy, e); - } - return e; - } diff --git a/SPECS/java-1.6.0-openjdk.spec b/SPECS/java-1.6.0-openjdk.spec index 9d29cfa..9b372b7 100644 --- a/SPECS/java-1.6.0-openjdk.spec +++ b/SPECS/java-1.6.0-openjdk.spec @@ -7,10 +7,10 @@ %define debug 0 -%define icedteaver 1.13.4 +%define icedteaver 1.13.5 %define icedteasnapshot %{nil} -%define openjdkver b32 -%define openjdkdate 15_jul_2014 +%define openjdkver b33 +%define openjdkdate 14_oct_2014 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ @@ -22,7 +22,7 @@ %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/ %define openjdkurl https://java.net/downloads/openjdk6/ -%define rhelzip openjdk-6-src-%{openjdkver}-%{openjdkdate}-rhel.tar.gz +%define rhelzip openjdk-6-src-%{openjdkver}-%{openjdkdate}-rhel.tar.xz %define multilib_arches ppc64 sparc64 x86_64 @@ -122,7 +122,7 @@ %define origin openjdk %define priority 16000 %define javaver 1.6.0 -%define buildver 0 +%define buildver 33 # Standard JPackage directories and symbolic links. # Make 64-bit JDKs just another alternative on 64-bit architectures. @@ -162,7 +162,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 6.%{icedteaver}%{?dist} +Release: %{icedteaver}.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 @@ -178,7 +178,7 @@ Group: Development/Languages License: ASL 1.1, ASL 2.0, GPL+, GPLv2, GPLv2 with exceptions, LGPL+, LGPLv2, MPLv1.0, MPLv1.1, Public Domain, W3C URL: http://icedtea.classpath.org/ -Source0: %{icedteaurl}download/source/icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz +Source0: %{icedteaurl}download/source/icedtea6-%{icedteaver}%{icedteasnapshot}.tar.xz # To generate, download OpenJDK tarball from %{openjdkurl}, # and run %{SOURCE3} on the tarball. Source1: %{rhelzip} @@ -200,9 +200,6 @@ Patch4: java-1.6.0-openjdk-accessible-toolkit.patch Patch5: java-1.6.0-openjdk-debugdocs.patch Patch6: %{name}-debuginfo.patch Patch104: type_hsx23_patch4.patch -#tmp patch to speedup backport -Patch9: rh1115580-unsyncHashMap.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -213,6 +210,7 @@ BuildRequires: alsa-lib-devel BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: giflib-devel +BuildRequires: libcap-devel BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libXp-devel @@ -353,8 +351,8 @@ Provides: java6-%{javaver}-javadoc = %{epoch}:%{version}-%{release} The OpenJDK API documentation. %prep -%setup -q -n icedtea6-%{icedteaver} -%setup -q -n icedtea6-%{icedteaver} -T -D -a 2 +%setup -q -n icedtea6-%{icedteaver}%{icedteasnapshot} +%setup -q -n icedtea6-%{icedteaver}%{icedteasnapshot} -T -D -a 2 %patch0 cp %{SOURCE4} . @@ -376,7 +374,7 @@ export CFLAGS="$CFLAGS -mieee" ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \ --with-pkgversion=rhel-%{release}-%{_arch} --enable-pulse-java \ --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \ - --with-rhino --with-parallel-jobs=$NUM_PROC --disable-lcms2 --disable-system-lcms + --with-rhino --with-parallel-jobs=$NUM_PROC --disable-lcms2 make patch @@ -389,7 +387,6 @@ patch -l -p0 < %{PATCH6} %endif patch -l -p1 < %{PATCH104} -patch -l -p0 < %{PATCH9} %if %{gcjbootstrap} @@ -879,6 +876,16 @@ exit 0 %doc %{_javadocdir}/%{name} %changelog +* Thu Oct 09 2014 Andrew Hughes - 1:1.6.0.33-1.13.5.0 +- Update to IcedTea 1.13.5 +- Remove upstreamed patches. +- Regenerate add-final-location-rpaths patch against new release. +- Change versioning to match java-1.7.0-openjdk so revisions work. +- Use xz for tarballs to reduce file size. +- No need to explicitly disable system LCMS any more (bug fixed upstream). +- Add icedteasnapshot to setup lines so they work with pre-release tarballs. +- Resolves: rhbz#1148901 + * Mon Jul 14 2014 Jiri Vanek - 1:1.6.0.1-6.1.13.4 - moved to icedteaver 1.13.4 - moved to openjdkver b32 and openjdkdate 15_jul_2014