From 0032cce9c404393f443338ea0524e54021f25104 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 26 2016 11:30:53 +0000 Subject: import java-1.6.0-openjdk-1.6.0.38-1.13.10.0.el7_2 --- diff --git a/.gitignore b/.gitignore index 50597a3..4f87253 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/icedtea6-1.13.9.tar.xz +SOURCES/icedtea6-1.13.10.tar.xz SOURCES/java-access-bridge-1.23.0.tar.bz2 -SOURCES/openjdk-6-src-b37-11_nov_2015-rhel.tar.xz +SOURCES/openjdk-6-src-b38-20_jan_2016-rhel.tar.xz diff --git a/.java-1.6.0-openjdk.metadata b/.java-1.6.0-openjdk.metadata index 567f462..09dd5f3 100644 --- a/.java-1.6.0-openjdk.metadata +++ b/.java-1.6.0-openjdk.metadata @@ -1,3 +1,3 @@ -1008639d477ea69b5cb772d24d1169283a704112 SOURCES/icedtea6-1.13.9.tar.xz +7b8fd8af297d277255d2935519e46db644c8a726 SOURCES/icedtea6-1.13.10.tar.xz aa2c61cc73bad1e1a09e8843f341270f70921dbf SOURCES/java-access-bridge-1.23.0.tar.bz2 -9d8e87df13213841e9daaee282b4e580d3d8c856 SOURCES/openjdk-6-src-b37-11_nov_2015-rhel.tar.xz +df85e21fa579f2af123b33e92d8109c528978fc2 SOURCES/openjdk-6-src-b38-20_jan_2016-rhel.tar.xz diff --git a/SPECS/java-1.6.0-openjdk.spec b/SPECS/java-1.6.0-openjdk.spec index 38a4efc..de434fa 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.9 +%define icedteaver 1.13.10 %define icedteasnapshot %{nil} -%define openjdkver 37 -%define openjdkdate 11_nov_2015 +%define openjdkver 38 +%define openjdkdate 20_jan_2016 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ @@ -162,7 +162,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: %{icedteaver}.4%{?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 @@ -294,6 +294,9 @@ Provides: jdbc6-stdext = 3.0 Provides: java6-sasl = %{epoch}:%{version} Provides: java6-fonts = %{epoch}:%{version} +# No means to bootstrap these architectures +ExcludeArch: aarch64 ppc64le + %description The OpenJDK runtime environment. @@ -882,43 +885,49 @@ exit 0 %doc %{_javadocdir}/%{name} %changelog -* Wed Nov 11 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.4 +* Thu Jan 21 2016 Andrew Hughes - 1:1.6.0.38-1.13.10.0 +- Update to IcedTea 1.13.10 & OpenJDK 6 b38. +- Resolves: rhbz#1295775 + +* Wed Nov 11 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.5 - Update with new IcedTea & b37 tarballs, including fix for appletviewer regression. -- Resolves: rhbz#1271929 +- Resolves: rhbz#1271931 -* Tue Nov 10 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.3 +* Tue Nov 10 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.4 - Update with new IcedTea & b37 tarballs, including more Kerberos fixes for TCK regression. -- Resolves: rhbz#1271929 +- Resolves: rhbz#1271931 -* Wed Nov 04 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.2 +* Wed Nov 04 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.3 - Update with new IcedTea & b37 tarballs, including Kerberos fixes for TCK regression. -- Resolves: rhbz#1271929 +- Resolves: rhbz#1271931 -* Mon Nov 02 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.1 +* Mon Nov 02 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.2 - Update with newer tarball, including 6763122 fix for TCK regression. -- Resolves: rhbz#1271929 +- Use release + 1 to avoid having a lower version than the 6.7 version. +- Resolves: rhbz#1271931 * Tue Oct 27 2015 Andrew Hughes - 1:1.6.0.37-1.13.9.0 - Update to IcedTea 1.13.9 -- Resolves: rhbz#1271929 +- Resolves: rhbz#1271931 * Tue Jul 28 2015 Andrew Hughes - 1:1.6.0.36-1.13.8.1 - Update tarball to fix TCK regression (PR2565) -- Resolves: rhbz#1235153 +- Resolves: rhbz#1235154 * Wed Jul 22 2015 Andrew Hughes - 1:1.6.0.36-1.13.8.0 - Update to IcedTea 1.13.8 - Update no_pr2125.patch to work against new version. -- Resolves: rhbz#1235153 +- Resolves: rhbz#1235154 * Fri Apr 10 2015 Andrew Hughes - 1:1.6.0.35-1.13.7.1 - Repackaged source files -- Resolves: rhbz#1209067 +- Resolves: rhbz#1209068 * Thu Apr 09 2015 Andrew Hughes - 1:1.6.0.35-1.13.7.0 - Update to IcedTea 1.13.7 - Regenerate add-final-location-rpaths patch so as to be less disruptive. -- Resolves: rhbz#1209067 +- Add ExcludeArch directive for RH1209326 +- Resolves: rhbz#1209068 * Thu Jan 22 2015 Andrew Hughes - 1:1.6.0.34-1.13.6.1 - Update to latest 1.13.6 release candidate tarball