From 4b282d073f363be47b8eda11dea9a5b45073e59e Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 6 Sep 2023 10:52:07 +0300 Subject: [PATCH] Only require cmake-rpm-macros when rpm-build is installed part II Turns out there's a duplicate dependency on cmake-rpm-macros in the -data package. This looks redundant but... Should've been in commit 9802a8d657560f7b7a019a9f9405d731477441d9 --- cmake.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index 01d053d..b2f3d73 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 5 +%global baserelease 6 # Set to RC version if building RC, else comment out. #global rcsuf rc1 @@ -237,7 +237,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}} @@ -552,6 +552,9 @@ popd %changelog +* Wed Sep 04 2023 Panu Matilainen - 3.27.4-6 +- Only require cmake-rpm-macros when rpm-build is installed part II + * Sat Sep 02 2023 Tom Stellard - 3.27.4-5 - Convert license to SPDX