From f9cb10146b60c2065d4854384b73d54a92ef4b6b Mon Sep 17 00:00:00 2001
From: Michel Lind <salimma@centosproject.org>
Date: Feb 05 2025 20:54:30 +0000
Subject: Merge commit 'd106c5b9b312d7e7a64c4a8f745ce0c798568d49' into c9s-sig-hyperscale


Signed-off-by: Michel Lind <salimma@centosproject.org>

---

diff --git a/kpatch.spec b/kpatch.spec
index 1231fc4..8d22bf9 100644
--- a/kpatch.spec
+++ b/kpatch.spec
@@ -34,6 +34,12 @@ Patch112:       0112-kpatch-build-Always-do-LLVM-1-with-CONFIG_CC_IS_CLAN.patch
 # kpatch-dnf backports (inactive -- for future reference)
 #Patch200:	0200-foo-bar-etcetera.patch
 
+BuildRequires:	make
+
+Requires:	bash kmod binutils
+Recommends:	kpatch-dnf
+
+
 %description
 kpatch is a live kernel patch module manager.  It allows the user to manage
 a collection of binary kernel patch modules which can be used to dynamically
@@ -75,29 +81,29 @@ kpatch-patch packages updates.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
 # Use this to apply upstream patches to kpatch
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
+%patch -P 100 -p1
+%patch -P 101 -p1
+%patch -P 102 -p1
+%patch -P 103 -p1
+%patch -P 104 -p1
+%patch -P 105 -p1
+%patch -P 106 -p1
+%patch -P 107 -p1
+%patch -P 108 -p1
+%patch -P 109 -p1
+%patch -P 110 -p1
+%patch -P 111 -p1
+%patch -P 112 -p1
 
 %setup -D -T -a 1
 
 # Use this to apply patches to kpatch-dnf (inactive)
 #cd kpatch-dnf-%{kpatch_dnf_ver}
-#%patch200 -p1
+#patch -P 200 -p1
 #cd ..
 
 %build
@@ -137,6 +143,10 @@ echo -e "\t$ dnf kpatch auto"
 * Fri May 31 2024 Davide Cavalca <dcavalca@centosproject.org> - 0.9.8-1.3
 - Backport two more fixes and refresh patches
 
+* Fri May 3 2024 Joe Lawrence <joe.lawrence@redhat.com> 0.9.7-3
+- Fix cs10 build error on missing `make` command
+- Fix "warning: %%patchN is deprecated"
+
 * Fri Oct 27 2023 Davide Cavalca <dcavalca@centosproject.org> - 0.9.8-1.2
 - Backport three upstream fixes