From 12ad0a269c3f476eec2a6562d4744fa87ef84655 Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Thu, 18 Nov 2021 15:32:17 +0100 Subject: [PATCH] kernel-srpm-macros.spec: add conflicts on kernel-rpm-macros < 185-9 Add conflicts of kernel-srpm-macros with kernel-rpm-macros < 185-9 as macros.kmp, kmodtool, and rpmsort were moved from the latter to the former. * kernel-srpm-macros.spec (Conflicts): Add kernel-rpm-macros < 185-9. (%changelog): New entry. Resolves: #2002887 Signed-off-by: Eugene Syromiatnikov --- kernel-srpm-macros.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel-srpm-macros.spec b/kernel-srpm-macros.spec index 756bfef..54cb3f1 100644 --- a/kernel-srpm-macros.spec +++ b/kernel-srpm-macros.spec @@ -1,6 +1,6 @@ Name: kernel-srpm-macros Version: 1.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: RPM macros that list arches the full kernel is built on # This package only exist in Fedora repositories # The license is the standard (MIT) specified in @@ -11,6 +11,9 @@ URL: https://src.fedoraproject.org/rpms/kernel-srpm-macros BuildArch: noarch # We are now the ones shipping kmod.attr Conflicts: redhat-rpm-config <= 184 +# macros.kmp, kmodtool and rpmsort were moved from kernel-rpm-macros +# to kernel-srpm-macros in 1.0-9/185-9 +Conflicts: kernel-rpm-macros < 185-9 # Macros Source0: macros.kernel-srpm @@ -118,6 +121,11 @@ install -p -m 644 -t "%{buildroot}%{_fileattrsdir}" modalias.attr %{rrcdir}/find-provides.d/modalias.prov %changelog +* Thu Nov 18 2021 Eugene Syromiatnikov - 1.0-10 +- Add conflicts of kernel-srpm-macros with kernel-rpm-macros < 185-9 + as macros.kmp, kmodtool, and rpmsort were moved from the latter + to the former. + * Mon Sep 20 2021 Eugene Syromiatnikov - 1.0-9 - Update scripts with RHEL-specific changes.