From 45f8cb3fe3f93e0e0a937a91218fdaadda2ff8ae Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Wed, 20 Mar 2024 20:33:05 +0000 Subject: [PATCH] Use backward-compatible patch syntax Related: RHEL-30943 --- java-21-openjdk.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 0341c3a..5c277fe 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -1860,11 +1860,24 @@ sh %{SOURCE12} %{top_level_dir_name} %endif # Patch the JDK +# This syntax is deprecated: +# %patchN [...] +# and should be replaced with: +# %patch -PN [...] +# For example: +# %patch1001 -p1 +# becomes: +# %patch -P1001 -p1 +# The replacement format suggested by recent (circa Fedora 38) RPM +# deprecation messages: +# %patch N [...] +# is not backward-compatible with prior (circa RHEL-8) versions of +# rpmbuild. pushd %{top_level_dir_name} # Add crypto policy and FIPS support -%patch1001 -p1 +%patch -P1001 -p1 # Patches in need of upstreaming -%patch6 -p1 +%patch -P6 -p1 popd # openjdk @@ -2509,6 +2522,7 @@ require "copy_jdk_configs.lua" - generate_source_tarball.sh: shellcheck: Double-quote variable references (SC2086) - generate_source_tarball.sh: shellcheck: Do not use -a (SC2166) - generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004) +- Use backward-compatible patch syntax - Related: RHEL-30943 * Sun Apr 14 2024 Andrew Hughes - 1:21.0.3.0.1-0.2.ea