From bbd22aa2ed5288da92fd96d63762aa8e3f63c8cb Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 2 Nov 2023 14:25:07 -0700 Subject: [PATCH] Fix conflict with license files Resolves: RHEL-7393 --- cmake.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/cmake.spec b/cmake.spec index 25241ae..5a49ae9 100644 --- a/cmake.spec +++ b/cmake.spec @@ -65,7 +65,7 @@ %{?rcsuf:%global versuf -%{rcsuf}} # For handling bump release by rpmdev-bumpspec and mass rebuild -%global baserelease 1 +%global baserelease 2 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -200,6 +200,11 @@ Provides: bundled(md5-deutsch) # https://fedorahosted.org/fpc/ticket/555 Provides: bundled(kwsys) +# The license files are shipped in both the cmake and cmake-doc packages and +# can cause conflicts when updating. +# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JDSG4K2S3IRCSZ37WCUGABY3JA45QMVA/#GEZTXMP5SXNMGAT3JPXDSQM5FPOLUJ5K +Conflicts: cmake-doc < %{version}-%{release} + %description CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates @@ -231,8 +236,10 @@ This package contains common data-files for %{name}. Summary: Documentation for %{name} BuildArch: noarch -# license files moved from the doc package to main package. -Conflicts: %{name} <= 3.20.1 +# The license files are shipped in both the cmake and cmake-doc packages and +# can cause conflicts when updating. +# See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JDSG4K2S3IRCSZ37WCUGABY3JA45QMVA/#GEZTXMP5SXNMGAT3JPXDSQM5FPOLUJ5K +Conflicts: %{name} < %{version}-%{release} %description doc This package contains documentation for %{name}. @@ -523,6 +530,9 @@ popd %changelog +* Fri Nov 03 2023 Tom Stellard - 3.26.5-2 +- Fix conflict with license files. + * Thu Oct 26 2023 Tom Stellard - 3.26.5-1 - Update to version 3.26.5-1