diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec
index 2c1f767..62344f3 100644
--- a/cross-aarch64-gcc13-bootstrap.spec
+++ b/cross-aarch64-gcc13-bootstrap.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec
index b10f812..c6e1d80 100644
--- a/cross-aarch64-gcc13.spec
+++ b/cross-aarch64-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec
index 076da5c..542a7f3 100644
--- a/cross-amdgcn-gcc13.spec
+++ b/cross-amdgcn-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec
index 17dcbf8..12129a3 100644
--- a/cross-arm-gcc13.spec
+++ b/cross-arm-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec
index 7d7a48a..f39934d 100644
--- a/cross-arm-none-gcc13-bootstrap.spec
+++ b/cross-arm-none-gcc13-bootstrap.spec
@@ -344,30 +344,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec
index d389dc9..4ddd076 100644
--- a/cross-arm-none-gcc13.spec
+++ b/cross-arm-none-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec
index d7a2a70..af778dd 100644
--- a/cross-avr-gcc13-bootstrap.spec
+++ b/cross-avr-gcc13-bootstrap.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec
index 8f4d60f..4dfc0de 100644
--- a/cross-avr-gcc13.spec
+++ b/cross-avr-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec
index f25802a..c83d90e 100644
--- a/cross-bpf-gcc13.spec
+++ b/cross-bpf-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec
index 80f8428..169f806 100644
--- a/cross-epiphany-gcc13-bootstrap.spec
+++ b/cross-epiphany-gcc13-bootstrap.spec
@@ -344,30 +344,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec
index 393fde7..6b0ec23 100644
--- a/cross-epiphany-gcc13.spec
+++ b/cross-epiphany-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec
index 6244f9b..300492e 100644
--- a/cross-hppa-gcc13-bootstrap.spec
+++ b/cross-hppa-gcc13-bootstrap.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec
index 95a44eb..056a0a1 100644
--- a/cross-hppa-gcc13.spec
+++ b/cross-hppa-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec
index e21cd4b..12f1d2c 100644
--- a/cross-m68k-gcc13.spec
+++ b/cross-m68k-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec
index 372f9f0..6d55d72 100644
--- a/cross-mips-gcc13.spec
+++ b/cross-mips-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec
index a07189b..527ed91 100644
--- a/cross-nvptx-gcc13.spec
+++ b/cross-nvptx-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec
index af2b955..64408a0 100644
--- a/cross-ppc64-gcc13.spec
+++ b/cross-ppc64-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-ppc64le-gcc13-bootstrap.spec b/cross-ppc64le-gcc13-bootstrap.spec
index ba407f5..b5f27dd 100644
--- a/cross-ppc64le-gcc13-bootstrap.spec
+++ b/cross-ppc64le-gcc13-bootstrap.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec
index 7b551ff..477f044 100644
--- a/cross-ppc64le-gcc13.spec
+++ b/cross-ppc64le-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec
index e82aeb1..da35480 100644
--- a/cross-pru-gcc13-bootstrap.spec
+++ b/cross-pru-gcc13-bootstrap.spec
@@ -344,30 +344,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec
index 5164d34..2df00c2 100644
--- a/cross-pru-gcc13.spec
+++ b/cross-pru-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec
index 7c43b87..6821d1f 100644
--- a/cross-riscv64-elf-gcc13-bootstrap.spec
+++ b/cross-riscv64-elf-gcc13-bootstrap.spec
@@ -344,30 +344,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec
index 5f73eff..95e8d64 100644
--- a/cross-riscv64-elf-gcc13.spec
+++ b/cross-riscv64-elf-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec
index 2c38aa1..a6dfdfd 100644
--- a/cross-riscv64-gcc13-bootstrap.spec
+++ b/cross-riscv64-gcc13-bootstrap.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec
index cc7cd3c..91ffe02 100644
--- a/cross-riscv64-gcc13.spec
+++ b/cross-riscv64-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec
index 564368d..394f1aa 100644
--- a/cross-rx-gcc13-bootstrap.spec
+++ b/cross-rx-gcc13-bootstrap.spec
@@ -344,30 +344,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec
index 9e08d31..9da7630 100644
--- a/cross-rx-gcc13.spec
+++ b/cross-rx-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-s390x-gcc13-bootstrap.spec b/cross-s390x-gcc13-bootstrap.spec
index 9531a12..7f2142b 100644
--- a/cross-s390x-gcc13-bootstrap.spec
+++ b/cross-s390x-gcc13-bootstrap.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec
index 1a55ad6..01e6f5a 100644
--- a/cross-s390x-gcc13.spec
+++ b/cross-s390x-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec
index 0d52125..0764dec 100644
--- a/cross-sparc-gcc13.spec
+++ b/cross-sparc-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec
index 9a4c644..e881130 100644
--- a/cross-sparc64-gcc13.spec
+++ b/cross-sparc64-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec
index cae319a..758d843 100644
--- a/cross-x86_64-gcc13.spec
+++ b/cross-x86_64-gcc13.spec
@@ -343,30 +343,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/gcc.spec.in b/gcc.spec.in
index 5386a5d..3dfb012 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1063,7 +1063,6 @@ Provides:	libgccjit%{libgccjit_sover} = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
 # to co-exist without an overly large list of provides/obsoletes
 Conflicts:	%selfconflict libgccjit%{libgccjit_sover}
-Requires: gcc@base_ver@
 
 %description -n libgccjit%{libgccjit_sover}%{libgccjit_suffix}
 Support for embedding GCC inside programs and libraries
@@ -1080,7 +1079,7 @@ Provides:	libgccjit%{libgccjit_sover}-devel = %{version}-%{release}
 # Only one gccjit package can be installed at the same time since
 # header files conflict
 Conflicts:	%selfconflict libgccjit%{libgccjit_sover}-devel
-Requires: libgccjit%{libgccjit_sover}%{libgccjit_suffix}
+Requires: libgccjit%{libgccjit_sover} >= %{version}-%{release}
 
 %description -n libgccjit%{libgccjit_sover}-devel%{libdevel_suffix}
 Package contains header files and documentation for GCC JIT front-end.
@@ -1337,30 +1336,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec
index 61231c3..b83755c 100644
--- a/gcc13-testresults.spec
+++ b/gcc13-testresults.spec
@@ -527,30 +527,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end
 
diff --git a/gcc13.changes b/gcc13.changes
index 73e94aa..4809e0e 100644
--- a/gcc13.changes
+++ b/gcc13.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Mar  5 14:35:38 UTC 2024 - Richard Biener <rguenther@suse.com>
+
+- Fix libgccjit-devel dependency, a newer shared library is OK.
+- Fix libgccjit dependency, the corresponding compiler isn't required.
+
+-------------------------------------------------------------------
+Thu Feb 22 14:50:13 UTC 2024 - Richard Biener <rguenther@suse.com>
+
+- Use %patch -P N instead of %patchN. 
+
 -------------------------------------------------------------------
 Thu Feb  8 08:17:53 UTC 2024 - Richard Biener <rguenther@suse.com>
 
diff --git a/gcc13.spec b/gcc13.spec
index ccbcff4..ecf1166 100644
--- a/gcc13.spec
+++ b/gcc13.spec
@@ -1891,7 +1891,6 @@ Provides:       libgccjit%{libgccjit_sover} = %{version}-%{release}
 # Only one package may provide this - allows multiple gcc versions
 # to co-exist without an overly large list of provides/obsoletes
 Conflicts:      %selfconflict libgccjit%{libgccjit_sover}
-Requires:       gcc13
 
 %description -n libgccjit%{libgccjit_sover}%{libgccjit_suffix}
 Support for embedding GCC inside programs and libraries
@@ -1908,7 +1907,7 @@ Provides:       libgccjit%{libgccjit_sover}-devel = %{version}-%{release}
 # Only one gccjit package can be installed at the same time since
 # header files conflict
 Conflicts:      %selfconflict libgccjit%{libgccjit_sover}-devel
-Requires:       libgccjit%{libgccjit_sover}%{libgccjit_suffix}
+Requires:       libgccjit%{libgccjit_sover} >= %{version}-%{release}
 
 %description -n libgccjit%{libgccjit_sover}-devel%{libdevel_suffix}
 Package contains header files and documentation for GCC JIT front-end.
@@ -2347,30 +2346,30 @@ ln -s newlib-4.3.0.20230120/newlib .
 
 #test patching start
 
-%patch2
-%patch5
-%patch6
-%patch7
-%patch11
-%patch15
-%patch16
-%patch17 -p1
+%patch -P 2
+%patch -P 5
+%patch -P 6
+%patch -P 7
+%patch -P 11
+%patch -P 15
+%patch -P 16
+%patch -P 17 -p1
 # These patches are needed only for llvm11
 %if "%{TARGET_ARCH}" == "amdgcn" && %{suse_version} < 1550
-%patch18 -p1
-%patch20 -p1
+%patch -P 18 -p1
+%patch -P 20 -p1
 %endif
 # In SLE15 and earlier default to dwarf4, not dwarf5
 %if %{suse_version} < 1550
-%patch19 -p1
+%patch -P 19 -p1
 %endif
-%patch21 -p1
-%patch23 -p1
-%patch24 -p1
-%patch51
-%patch60 -p1
-%patch61 -p1
-%patch100 -p1
+%patch -P 21 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 51
+%patch -P 60 -p1
+%patch -P 61 -p1
+%patch -P 100 -p1
 
 #test patching end