From 9f3da675bdd883c92a31f7952ac4aa525c27b2dd Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 1 Dec 2025 16:26:14 -0800 Subject: [PATCH] Make clang-rpm-macros requires conditional on rpm-build Resolves: RHEL-103914 Resolves: RHEL-130791 --- cmake.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 7386da5..af9049d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -74,7 +74,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 2 +%global baserelease 3 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -198,7 +198,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) @@ -232,7 +232,7 @@ generation, code generation, and template instantiation. Summary: Common data-files for %{name} Requires: %{name} = %{version}-%{release} Requires: %{name}-filesystem = %{version}-%{release} -Requires: %{name}-rpm-macros = %{version}-%{release} +Requires: (%{name}-rpm-macros = %{version}-%{release} if rpm-build) %if %{with emacs} %if 0%{?fedora} || 0%{?rhel} >= 7 Requires: emacs-filesystem%{?_emacs_version: >= %{_emacs_version}} @@ -555,6 +555,9 @@ popd %changelog +* Tue Dec 02 2025 Tom Stellard - 3.31.8-4 +- Make clang-rpm-macros requires conditional on rpm-build + * Fri Nov 28 2025 Tom Stellard - 3.31.8-2 - macros: Fix missing asterisk in ctest macro