From bfdcd8457a6eb1acafde23050978d697ce7d377a Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Wed, 7 Jul 2021 11:17:39 +0200 Subject: [PATCH] Another attempt at fixing License file Related: rhbz#1975234 --- cmake.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake.spec b/cmake.spec index 0988f35..9d259f1 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 5 +%global baserelease 6 # Uncomment if building for EPEL #global name_suffix %%{major_version} @@ -198,9 +198,6 @@ Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} # Explicitly require make. (rhbz#1862014) Requires: make -# When license files moved from the doc package to main package. -Conflicts: %{name}-doc <= 3.18.2 - # Provide the major version name Provides: %{orig_name}%{major_version} = %{version}-%{release} @@ -242,6 +239,9 @@ 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}%{?_isa} <= 3.20.1 + %description doc This package contains documentation for %{name}. @@ -531,6 +531,9 @@ popd %changelog +* Wed Jul 07 2021 sguelton@redhat.com - 3.20.2-6 +- Another attempt at fixing License file + * Thu Jul 01 2021 sguelton@redhat.com - 3.20.2-5 - libdl patch after glibc update (#1975096)