From 9802a8d657560f7b7a019a9f9405d731477441d9 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 31 Aug 2023 14:18:09 +0300 Subject: [PATCH] Only require cmake-rpm-macros when rpm-build is installed There are other use-cases for cmake besides building rpms, for which a hard requirement of rpm is absurd. Ironically enough, this hard dependency also causes an ugly conflict requiring --nodeps hacks when building rpm's own test-suite. A conditional dependency on rpm-build sorts the issue nicely with no regressions to the use-case of building packages. --- cmake.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 13a60ee..32fdbb1 100644 --- a/cmake.spec +++ b/cmake.spec @@ -72,7 +72,7 @@ %global patch_version 4 # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -208,7 +208,7 @@ BuildRequires: %{name}-rpm-macros BuildRequires: make Requires: %{name}-data = %{version}-%{release} -Requires: %{name}-rpm-macros = %{version}-%{release} +Requires: (%{name}-rpm-macros = %{version}-%{release} if rpm-build) Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} # Explicitly require make. (rhbz#1862014) @@ -552,6 +552,9 @@ popd %changelog +* Thu Aug 31 2023 Panu Matilainen - 3.27.4-3 +- Only require cmake-rpm-macros when rpm-build is installed + * Mon Aug 28 2023 Björn Esser - 3.27.4-2 - Add upstream patch to fix linking non-builtin libatomic on some arches