From 1f1cfd32db330d10bee255c482eab87f7a85c220 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 29 2020 18:28:01 +0000 Subject: import java-11-openjdk-11.0.8.10-5.el8 --- diff --git a/SPECS/java-11-openjdk.spec b/SPECS/java-11-openjdk.spec index b8aac10..fc0c07b 100644 --- a/SPECS/java-11-openjdk.spec +++ b/SPECS/java-11-openjdk.spec @@ -251,9 +251,9 @@ %endif # Define vendor information used by OpenJDK -%global vendor "Oracle Corporation" -%global vendor_url "https://openjdk.java.net/" -%global vendor_bug_url "https://bugreport.java.com/bugreport/" +%global oj_vendor "Oracle Corporation" +%global oj_vendor_url "https://openjdk.java.net/" +%global oj_vendor_bug_url "https://bugreport.java.com/bugreport/" # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 3.15.0 @@ -264,7 +264,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 10 -%global rpmrelease 4 +%global rpmrelease 5 #%%global tagsuffix %%{nil} # priority must be 8 digits in total; untill openjdk 1.8 we were using 18..... so when moving to 11 we had to add another digit %if %is_system_jdk @@ -1766,7 +1766,7 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||") # Check correct vendor values have been set $JAVA_HOME/bin/javac -d . %{SOURCE16} -$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") %{vendor} %{vendor_url} %{vendor_bug_url} +$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") %{oj_vendor} %{oj_vendor_url} %{oj_vendor_bug_url} # Check debug symbols in static libraries (smoke test) export STATIC_LIBS_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{static_libs_image} @@ -2212,6 +2212,10 @@ end %endif %changelog +* Fri Aug 28 2020 Andrew Hughes - 1:11.0.8.10-5 +- Use 'oj_' prefix on new vendor globals to avoid a conflict with RPM's vendor value. +- Resolves: rhbz#1868406 + * Tue Aug 25 2020 Andrew Hughes - 1:11.0.8.10-4 - Disable TLSv1.3 when the FIPS crypto policy and the NSS-FIPS provider are in use. - Resolves: rhbz#1860986