diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index ba48ef3..d990a5c 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -1347,8 +1347,6 @@ Patch600: rh1750419-redhat_alt_java.patch # Ignore AWTError when assistive technologies are loaded Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch -# Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo -Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch # Crypto policy and FIPS support patches # Patch is generated from the fips-17u tree at https://github.com/rh-openjdk/jdk/tree/fips-17u @@ -1401,6 +1399,9 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch # ############################################# +# Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo +Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch + ############################################# # # OpenJDK patches appearing in 17.0.10 @@ -2499,6 +2500,7 @@ require "copy_jdk_configs.lua" - generate_source_tarball.sh: Add license - openjdk_news.sh: Use grep -E instead of egrep - Remove RH1649512 patch for libjpeg-turbo FAR macro +- Move pcsc-lite-libs patch to in-need-of-upstreaming section - Related: RHEL-27133 * Thu Jan 11 2024 Andrew Hughes - 1:17.0.10.0.7-2