pkg: fedora: Remove older versions that ship the watchdog in kernel-core

pkg/fedora/kernel-surface/patches/0003-obsoletes.patch

@@ -1,4 +1,4 @@
-From ee2289e8c6a72b5e778fb0f16bc804ca290cf868 Mon Sep 17 00:00:00 2001
+From 360961a67b03503c59b7434ccc5bd1d2fa40b55e Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sun, 14 May 2023 18:16:38 +0200
 Subject: [PATCH] Let kernel-surface conflict with older versions of the
@@ -6,11 +6,11 @@ Subject: [PATCH] Let kernel-surface conflict with older versions of the
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
 ---
- redhat/kernel.spec.template | 6 ++++++
- 1 file changed, 6 insertions(+)
+ redhat/kernel.spec.template | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index d952180f91ef..e59589949020 100644
+index d952180f91ef..dc95736a227e 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
 @@ -599,6 +599,10 @@ Requires: kernel-modules-uname-r = %{KVERREL}
@@ -28,11 +28,74 @@ index d952180f91ef..e59589949020 100644
  Provides: kernel-devel-uname-r = %{KVERREL}%{?1:+%{1}}\
  Provides: kernel-devel = %{KVERREL}%{?1:+%{1}}\
  Provides: installonlypkg(kernel)\
-+Conflicts: kernel-surface-devel < 6.3.6-1\
-+Obsoletes: kernel-surface-devel < 6.3.6-1\
++Conflicts: %{package_name}-devel < 6.3.7-2\
++Obsoletes: %{package_name}-devel < 6.3.7-2\
  AutoReqProv: no\
  Requires(pre): findutils\
  Requires: findutils\
+@@ -1259,6 +1265,8 @@ Summary: Meta package to install matching core and devel packages for a given %{
+ Requires: %{package_name}%{?1:-%{1}}-devel = %{specrpmversion}-%{release}\
+ Requires: %{package_name}%{?1:-%{1}}-core = %{specrpmversion}-%{release}\
+ Provides: kernel-devel-matched = %{specrpmversion}-%{release}\
++Conflicts: %{package_name}-devel-matched < 6.3.7-2\
++Obsoletes: %{package_name}-devel-matched < 6.3.7-2\
+ %description %{?1:%{1}-}devel-matched\
+ This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\
+ %{nil}
+@@ -1291,6 +1299,8 @@ Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{?1:+%{1}}\
+ Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
+ Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
+ Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
++Conflicts: %{package_name}-modules-internal < 6.3.7-2\
++Obsoletes: %{package_name}-modules-internal < 6.3.7-2\
+ AutoReq: no\
+ AutoProv: yes\
+ %description %{?1:%{1}-}modules-internal\
+@@ -1312,6 +1322,8 @@ Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\
+ Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
+ Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
+ Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
++Conflicts: %{package_name}-modules-extra < 6.3.7-2\
++Obsoletes: %{package_name}-modules-extra < 6.3.7-2\
+ %if %{-m:1}%{!-m:0}\
+ Requires: kernel-modules-extra-uname-r = %{KVERREL}\
+ %endif\
+@@ -1335,6 +1347,8 @@ Provides: installonlypkg(kernel-module)\
+ Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
+ Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
+ Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
++Conflicts: %{package_name}-modules < 6.3.7-2\
++Obsoletes: %{package_name}-modules < 6.3.7-2\
+ %if %{-m:1}%{!-m:0}\
+ Requires: kernel-modules-uname-r = %{KVERREL}\
+ %endif\
+@@ -1357,6 +1371,8 @@ Provides: kernel-modules-core = %{specrpmversion}-%{release}%{?1:+%{1}}\
+ Provides: installonlypkg(kernel-module)\
+ Provides: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
+ Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
++Conflicts: %{package_name}-modules-core < 6.3.7-2\
++Obsoletes: %{package_name}-modules-core < 6.3.7-2\
+ %if %{-m:1}%{!-m:0}\
+ Requires: kernel-modules-core-uname-r = %{KVERREL}\
+ %endif\
+@@ -1376,6 +1392,8 @@ summary: kernel meta-package for the %{1} kernel\
+ Requires: kernel-%{1}-core-uname-r = %{KVERREL}+%{1}\
+ Requires: kernel-%{1}-modules-uname-r = %{KVERREL}+%{1}\
+ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}+%{1}\
++Conflicts: %{package_name} < 6.3.7-2\
++Obsoletes: %{package_name} < 6.3.7-2\
+ Provides: installonlypkg(kernel)\
+ Provides: kernel = %{KVERREL}+%{1}\
+ %description %{1}\
+@@ -1393,6 +1411,8 @@ Summary: %{variant_summary}\
+ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
+ Provides: installonlypkg(kernel)\
+ Provides: kernel-%{?1:%{1}-}core = %{KVERREL}%{?1:+%{1}}\
++Conflicts: %{package_name}-core < 6.3.7-2\
++Obsoletes: %{package_name}-core < 6.3.7-2\
+ %if %{-m:1}%{!-m:0}\
+ Requires: kernel-core-uname-r = %{KVERREL}\
+ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
 -- 
 2.40.1