From 96d22b75b438a63ca8e90372cfaf99ad9686b028 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 23 2019 15:37:04 +0000 Subject: import java-1.7.0-openjdk-1.7.0.231-2.6.19.1.el7_6 --- diff --git a/.gitignore b/.gitignore index d364af4..9127a62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/class-rewriter.tar.gz -SOURCES/openjdk-icedtea-2.6.18.tar.xz +SOURCES/openjdk-icedtea-2.6.19.tar.xz SOURCES/pulseaudio.tar.gz -SOURCES/systemtap-tapset-2.6.12.tar.xz +SOURCES/systemtap-tapset-2.6.19.tar.xz diff --git a/.java-1.7.0-openjdk.metadata b/.java-1.7.0-openjdk.metadata index e01c260..69e44f3 100644 --- a/.java-1.7.0-openjdk.metadata +++ b/.java-1.7.0-openjdk.metadata @@ -1,4 +1,4 @@ fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz -3ab2a6aa355a6c1659048ba113d6f68ad33bfe48 SOURCES/openjdk-icedtea-2.6.18.tar.xz +c2e2b8d2db547950595444dcf045f361fd11669e SOURCES/openjdk-icedtea-2.6.19.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz -5ea75731a73ec4766b00024c1803d1f86c0af090 SOURCES/systemtap-tapset-2.6.12.tar.xz +38b74f261642b087ada2dc4063bf2b468d865b0e SOURCES/systemtap-tapset-2.6.19.tar.xz diff --git a/SOURCES/fsg.sh b/SOURCES/fsg.sh index 61065cb..d4eda6c 100644 --- a/SOURCES/fsg.sh +++ b/SOURCES/fsg.sh @@ -123,12 +123,18 @@ echo "Syncing EC list with NSS" if [ "x$PR2124" = "x" ] ; then # get pr2124.patch (from http://icedtea.classpath.org//hg/icedtea7) # Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2124) - wget -O ${TMPDIR}/pr2124.patch http://icedtea.classpath.org/hg/icedtea7/raw-file/tip/patches/pr2124.patch - patch -Np0 < ${TMPDIR}/pr2124.patch - rm -vf ${TMPDIR}/pr2124.patch -else - echo "Applying ${PR2124}" - patch -Np0 < $PR2124 -fi; + TMPPR2124=${TMPDIR}/pr2124.patch + PR2124=${TMPPR2124} + wget -O ${PR2124} http://icedtea.classpath.org/hg/icedtea7/raw-file/tip/patches/pr2124.patch +fi +echo "Applying ${PR2124}" +if ! patch -Np0 < ${PR2124} ; then + echo "Patching failed."; + exit 1; +fi echo "Cleaning up after patch application..." find . -name '*.orig' | xargs rm -vf +if [ "x$TMPPR2124" != "x" ] ; then + rm -vf ${TMPPR2124} +fi + diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index 09ec205..0dce48a 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -5,7 +5,7 @@ # conflicting) files in the -debuginfo package %undefine _missing_build_ids_terminate_build -%global icedtea_version 2.6.18 +%global icedtea_version 2.6.19 %global icedtea_snapshot %{nil} %global hg_tag icedtea-%{icedtea_version}%{icedtea_snapshot} @@ -160,8 +160,8 @@ # Standard JPackage naming and versioning defines. %global origin openjdk %global top_level_dir_name %{origin} -%global updatever 221 -%global buildver 02 +%global updatever 231 +%global buildver 01 # Keep priority on 7digits in case updatever>9 %global priority 1700%{updatever} %global javaver 1.7.0 @@ -206,7 +206,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}%{icedtea_snapshot}.0%{?dist} +Release: %{icedtea_version}%{icedtea_snapshot}.1%{?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 @@ -250,8 +250,8 @@ Source2: README.src Source5: class-rewriter.tar.gz # Systemtap tapsets. Zipped up to keep it small. -# last update from IcedTea 2.6.10 -Source6: systemtap-tapset-2.6.12.tar.xz +# last update from IcedTea 2.6.19 +Source6: systemtap-tapset-2.6.19.tar.xz # .desktop files. Source7: policytool.desktop @@ -599,7 +599,7 @@ tar xf %{SOURCE6} for file in tapset/*.in; do - OUTPUT_FILE=`echo $file | sed -e s:%{javaver}\.stp\.in$:%{version}-%{release}.stp:g` + OUTPUT_FILE=`echo $file | sed -e s:\.stp\.in$:-%{version}-%{release}.stp:g` sed -e s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir}/jre/lib/%{archinstall}/server/libjvm.so:g $file > $file.1 # FIXME this should really be %if %{has_client_jvm} %ifarch %{ix86} @@ -1505,6 +1505,19 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Tue Jul 16 2019 Andrew Hughes - 1:1.7.0.231-2.6.19.1 +- Add missing hyphen in tapset filename. +- Resolves: rhbz#1724452 + +* Tue Jul 16 2019 Andrew Hughes - 1:1.7.0.231-2.6.19.0 +- Update tapset filename matching pattern. +- Resolves: rhbz#1724452 + +* Tue Jul 16 2019 Andrew Hughes - 1:1.7.0.231-2.6.19.0 +- Bump to 2.6.19 (including tapsets) and OpenJDK 7u231-b01. +- Fix fsg.sh to fail if patching fails. +- Resolves: rhbz#1724452 + * Tue Apr 16 2019 Andrew Hughes - 1:1.7.0.221-2.6.18.0 - Bump to 2.6.18 and OpenJDK 7u221-b02. - Resolves: rhbz#1693468