SPECS/raspberrypi2.spec

@@ -11,7 +11,7 @@ ExclusiveArch: aarch64
 
 %define local_version v8
 %define bcmmodel 2711
-%define extra_version 3
+%define extra_version 2
 
 # This originally implies Kernel 4.x for RPi 2 and is not appropriate now.
 # Be careful to change this not to disturb the seamless package update.
@@ -99,9 +99,7 @@ Provides:  cpufrequtils = 1:009-0.6.p1
 Obsoletes: cpufreq-utils < 1:009-0.6.p1
 Obsoletes: cpufrequtils < 1:009-0.6.p1
 Obsoletes: cpuspeed < 1:1.5-16
-Requires: %{name}-kernel%{?ksuffix}-tools-libs = %{version}-%{release}
-Obsoletes: kernel-tools < %{version}
-Provides: kernel-tools = %{version}-%{release}
+Requires: kernel-tools-libs = %{version}-%{release}
 %define __requires_exclude ^%{_bindir}/python
 %description kernel%{?ksuffix}-tools
 This package contains the tools/ directory from the kernel source
@@ -109,20 +107,18 @@ and the supporting documentation.
 
 %package kernel%{?ksuffix}-tools-libs
 Summary: Libraries for the kernels-tools
-Obsoletes: kernel-tools-libs < %{version}
-Provides: kernel-tools-libs = %{version}-%{release}
+Provides: kernel-tools-libs
 %description kernel%{?ksuffix}-tools-libs
 This package contains the libraries built from the tools/ directory
 from the kernel source.
 
 %package kernel%{?ksuffix}-tools-libs-devel
 Summary: Assortment of tools for the Linux kernel
-Requires: %{name}-kernel%{?ksuffix}-tools = %{version}-%{release}
+Requires: kernel%{?ksuffix}-tools = %{version}-%{release}
 Provides:  cpupowerutils-devel = 1:009-0.6.p1
 Obsoletes: cpupowerutils-devel < 1:009-0.6.p1
-Requires: %{name}-kernel%{?ksuffix}-tools-libs = %{version}-%{release}
-Obsoletes: kernel-tools-libs-devel < %{version}
-Provides: kernel-tools-libs-devel = %{version}-%{release}
+Requires: kernel-tools-libs = %{version}-%{release}
+Provides: kernel-tools-libs-devel
 %description kernel%{?ksuffix}-tools-libs-devel
 This package contains the development files for the tools/ directory from
 the kernel source.
@@ -394,11 +390,8 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 %endif
 
 %changelog
-* Fri Aug 30 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 6.6.31-20240529.v8.3
-- Fix kernel-tools dependencies
-
 * Thu Jun 20 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.31-20240529.v8.2
-- Add kernel-tools to optimize CPU clock (cpupower.service)
+-  Add kernel-tools to optimize CPU clock (cpupower.service)
 
 * Mon Jun 10 2024 Koichiro Iwao <meta@almalinux.org> - 6.6.31-20240529.v8.1
 - Update to v6.6.31 stable_20240529