Skip to content

Commit 8e7fd38

Browse files
committed
kernel-clk6.12: fix duplicate Obsoletes - move to metapackages only
Fixes issue where both kernel-core and kernel-debug-core were obsoleting the 'kernel' metapackage, causing DNF conflicts. Changes: - Removed 'Obsoletes: kernel = ...' from kernel_reqprovconf macro - Added 'Obsoletes: kernel = ...' to base metapackage (kernel-clk6.12) - Added 'Obsoletes: kernel-%{1} = ...' to kernel_meta_package macro for variants (kernel-clk6.12-debug, etc.) Now each old package is obsoleted by exactly one new package: - kernel → kernel-clk6.12 - kernel-core → kernel-clk6.12-core - kernel-debug → kernel-clk6.12-debug - kernel-debug-core → kernel-clk6.12-debug-core
1 parent fa66d6e commit 8e7fd38

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

ciq/SPECS/kernel-clk6.12.spec

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,6 +1045,13 @@ Patch999999: linux-kernel-test.patch
10451045

10461046
# END OF PATCH DEFINITIONS
10471047

1048+
Obsoletes: kernel = 6.12.15
1049+
Obsoletes: kernel = 6.12.30
1050+
Obsoletes: kernel = 6.12.43
1051+
Obsoletes: kernel = 6.12.63
1052+
Obsoletes: kernel = 6.12.74
1053+
Obsoletes: kernel = 6.12.77
1054+
10481055
%description
10491056
The kernel meta package
10501057

@@ -1058,12 +1065,6 @@ The kernel meta package
10581065
%if %{-o:0}%{!-o:1}\
10591066
Provides: kernel = %{specversion}-%{pkg_release}\
10601067
Provides: %{name} = %{specversion}-%{pkg_release}\
1061-
Obsoletes: kernel = 6.12.15\
1062-
Obsoletes: kernel = 6.12.30\
1063-
Obsoletes: kernel = 6.12.43\
1064-
Obsoletes: kernel = 6.12.63\
1065-
Obsoletes: kernel = 6.12.74\
1066-
Obsoletes: kernel = 6.12.77\
10671068
%endif\
10681069
Provides: %{name}-%{_target_cpu} = %{specversion}-%{pkg_release}%{uname_suffix %{?1:+%{1}}}\
10691070
Provides: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
@@ -1679,6 +1680,12 @@ Requires: %{name}-%{1}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
16791680
Requires: realtime-setup\
16801681
%endif\
16811682
Provides: installonlypkg(kernel)\
1683+
Obsoletes: kernel-%{1} = 6.12.15\
1684+
Obsoletes: kernel-%{1} = 6.12.30\
1685+
Obsoletes: kernel-%{1} = 6.12.43\
1686+
Obsoletes: kernel-%{1} = 6.12.63\
1687+
Obsoletes: kernel-%{1} = 6.12.74\
1688+
Obsoletes: kernel-%{1} = 6.12.77\
16821689
%description %{1}\
16831690
The meta-package for the %{1} kernel\
16841691
%{nil}

0 commit comments

Comments
 (0)