From 9ab1f083c78bd3bc71232ce9f83cb6208c29fd69 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 30 Mar 2023 13:16:23 +0200 Subject: [PATCH] Revert "moved from deprecated patchN to patch N" f37+ only This reverts commit 42e3f73cba96e083179a6de39605f1e580d971b0. --- java-latest-openjdk-portable.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec index 305fc28..6e06e32 100644 --- a/java-latest-openjdk-portable.spec +++ b/java-latest-openjdk-portable.spec @@ -952,17 +952,17 @@ sh %{SOURCE12} %{top_level_dir_name} # Patch the JDK pushd %{top_level_dir_name} -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 -%patch 6 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch6 -p1 # Add crypto policy and FIPS support -#%%patch 1001 -p1 - todo, adapt fips patch for jdk20 +#%%patch1001 -p1 - todo, adapt fips patch for jdk20 # nss.cfg PKCS11 support; must come last as it also alters java.security -%patch 1000 -p1 +%patch1000 -p1 popd # openjdk -%patch 600 +%patch600 # The OpenJDK version file includes the current # upstream version information. For some reason, @@ -1606,7 +1606,6 @@ done - inverted fresh_libjvm behavior to be disabled by default. fails: -- See: https://koji.fedoraproject.org/koji/taskinfo?taskID=99242677 - commented out tzdata tests -- moved from deprecated patchN to patch N * Tue Feb 07 2023 Jiri Vanel - 1:19.0.2.0.7-2.rolling