diff --git a/.gitignore b/.gitignore index deca9bb..b1ab069 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/icedtea6-1.13.11.tar.xz +SOURCES/icedtea6-1.13.12.tar.xz SOURCES/java-access-bridge-1.23.0.tar.bz2 -SOURCES/openjdk-6-src-b39-03_may_2016-rhel.tar.xz +SOURCES/openjdk-6-src-b40-22_aug_2016-rhel.tar.xz diff --git a/.java-1.6.0-openjdk.metadata b/.java-1.6.0-openjdk.metadata index c6d941f..726eda0 100644 --- a/.java-1.6.0-openjdk.metadata +++ b/.java-1.6.0-openjdk.metadata @@ -1,3 +1,3 @@ -500bac3c146994f1aaca788b21053234d5992c69 SOURCES/icedtea6-1.13.11.tar.xz +334ec1614dbbe68bc042844c54d43c0c931a620c SOURCES/icedtea6-1.13.12.tar.xz aa2c61cc73bad1e1a09e8843f341270f70921dbf SOURCES/java-access-bridge-1.23.0.tar.bz2 -0a82d98ca788ef0f7ad328ed3aabaa91721b88c6 SOURCES/openjdk-6-src-b39-03_may_2016-rhel.tar.xz +9bea0177b0dac662fe56d7aed483d61f71409d24 SOURCES/openjdk-6-src-b40-22_aug_2016-rhel.tar.xz diff --git a/SOURCES/add-final-location-rpaths.patch b/SOURCES/add-final-location-rpaths.patch index 3def45f..1340e6a 100644 --- a/SOURCES/add-final-location-rpaths.patch +++ b/SOURCES/add-final-location-rpaths.patch @@ -11,8 +11,8 @@ diff -r b85872bd06da Makefile.am --- a/Makefile.am Thu Apr 09 20:20:00 2015 +0100 +++ b/Makefile.am Thu Apr 09 20:41:52 2015 +0100 @@ -815,7 +815,8 @@ - BUILD_GCC=gcc$(GCC_SUFFIX) \ - BUILD_CXX=g++$(GCC_SUFFIX) \ + CC=$(CC)$(GCC_SUFFIX) \ + CXX=$(CXX)$(GCC_SUFFIX) \ COMPILER_WARNINGS_FATAL="$(WERROR_STATUS)" \ - UNLIMITED_CRYPTO="true" + UNLIMITED_CRYPTO="true" \ diff --git a/SPECS/java-1.6.0-openjdk.spec b/SPECS/java-1.6.0-openjdk.spec index 477fcc4..83967f8 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.11 +%define icedteaver 1.13.12 %define icedteasnapshot %{nil} -%define openjdkver 39 -%define openjdkdate 03_may_2016 +%define openjdkver 40 +%define openjdkdate 22_aug_2016 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ @@ -84,21 +84,18 @@ %endif %if %{gcjbootstrap} - -%ifarch %{jit_arches} -%define icedteaopt --enable-systemtap -%else %define icedteaopt %{nil} -%endif - %else +%define icedteaopt --with-jdk-home=/usr/lib/jvm/%{sdklnk} +%endif %ifarch %{jit_arches} -%define icedteaopt --with-jdk-home=/usr/lib/jvm/%{sdklnk} --disable-bootstrap --enable-systemtap +%define stapopt --enable-systemtap +%define bootstrapopt %{nil} %else -%define icedteaopt --with-jdk-home=/usr/lib/jvm/%{sdklnk} --disable-bootstrap -%endif - +%define stapopt %{nil} +#%%define bootstrapopt --disable-bootstrap +%define bootstrapopt %{nil} %endif # Convert an absolute path to a relative path. Each symbolic link is @@ -162,7 +159,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: %{icedteaver}.0%{?dist} +Release: %{icedteaver}.5%{?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 @@ -259,11 +256,16 @@ BuildRequires: prelink #systemtap build requirement. BuildRequires: systemtap-sdt-devel %endif +# configure looks for /etc/mime.types +# to provide the JDK symlink +BuildRequires: mailcap Requires: fontconfig Requires: libjpeg = 6b # Require /etc/pki/java/cacerts. Requires: ca-certificates +# Require /etc/mime.types +Requires: mailcap # Require jpackage-utils for ant. Requires: jpackage-utils >= 1.7.3-1jpp.2 # Require zoneinfo data provided by tzdata-java subpackage. @@ -381,10 +383,11 @@ export ARCH_DATA_MODEL=64 export CFLAGS="$CFLAGS -mieee" %endif ./autogen.sh -./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \ +%configure %{icedteaopt} %{bootstrapopt} %{stapopt} --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 + --with-rhino --with-parallel-jobs=$NUM_PROC --disable-lcms2 \ + --disable-tests --disable-systemtap-tests make DISTRIBUTION_PATCHES=patches/add-final-location-rpaths.patch patch @@ -396,9 +399,6 @@ patch -l -p0 < %{PATCH5} patch -l -p0 < %{PATCH6} %endif -%if %{gcjbootstrap} -make stamps/patch-ecj.stamp -%endif make %{debugbuild} INSTALL_LOCATION="%{_jvmdir}/%{sdkdir}" %ifarch %{jit_arches} @@ -421,6 +421,14 @@ pushd java-access-bridge-%{accessver} cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext popd +%check + +# Should be 'make check' but IcedTea 1.13.x doesn't support disabling SystemTap tests +# Enable when we switch to 1.14.x +#make check +make check-mimetype +make check-java-debug +make check-java-src %install rm -rf $RPM_BUILD_ROOT @@ -885,6 +893,40 @@ exit 0 %doc %{_javadocdir}/%{name} %changelog +* Mon Aug 22 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.5 +- Bump source tarballs to try and really fix TCK failures this time. +- Resolves: rhbz#1350046 + +* Mon Aug 22 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.4 +- Bump source tarballs to missing -DNDEBUG on JDK native code. +- Resolves: rhbz#1350046 + +* Fri Aug 19 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.3 +- Non-JIT architectures have not been bootstrapping, due to RPM reading commented macros +- Resolves: rhbz#1350046 + +* Fri Aug 19 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.2 +- Bump source tarballs to fix TCK failures. +- Resolves: rhbz#1350046 + +* Thu Aug 18 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.1 +- Separate bootstrap option as it should not be tied to the JDK used. +- Enable bootstrapping on JIT architectures going forward. +- Temporarily enable bootstrapping on all architectures to work around RH1334465/PR2956. +- Resolves: rhbz#1350046 + +* Wed Aug 17 2016 Andrew Hughes - 1:1.6.0.40-1.13.12.0 +- Update to IcedTea 1.13.12 & OpenJDK 6 b40. +- Separate SystemTap option from bootstrap options. +- Depend on mailcap for /etc/mime.types (PR2800) +- Use configure macro and disable long-running JTreg & SystemTap tests from make check +- Remove redundant patch-ecj target invocation for bootstrap build. +- Add check section to run the new tests introduced in 1.13.12. +- Fix context for rpath patch following PR3140. +- Add RHEL version of b40 tarball. +- Require mailcap at build time as well, so configure finds /etc/mime.types +- Resolves: rhbz#1350046 + * Wed May 04 2016 Andrew Hughes - 1:1.6.0.39-1.13.11.0 - Update to IcedTea 1.13.11 & OpenJDK 6 b39. - Resolves: rhbz#1325432