Another attempt at fixing License file

Related: rhbz#1975234
This commit is contained in:
serge-sans-paille 2021-07-07 11:17:39 +02:00
parent 2b062a56c0
commit bfdcd8457a

View File

@ -65,7 +65,7 @@
%{?rcsuf:%global versuf -%{rcsuf}} %{?rcsuf:%global versuf -%{rcsuf}}
# For handling bump release by rpmdev-bumpspec and mass rebuild # For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 5 %global baserelease 6
# Uncomment if building for EPEL # Uncomment if building for EPEL
#global name_suffix %%{major_version} #global name_suffix %%{major_version}
@ -198,9 +198,6 @@ Requires: %{name}-filesystem%{?_isa} = %{version}-%{release}
# Explicitly require make. (rhbz#1862014) # Explicitly require make. (rhbz#1862014)
Requires: make Requires: make
# When license files moved from the doc package to main package.
Conflicts: %{name}-doc <= 3.18.2
# Provide the major version name # Provide the major version name
Provides: %{orig_name}%{major_version} = %{version}-%{release} Provides: %{orig_name}%{major_version} = %{version}-%{release}
@ -242,6 +239,9 @@ This package contains common data-files for %{name}.
Summary: Documentation for %{name} Summary: Documentation for %{name}
BuildArch: noarch BuildArch: noarch
# license files moved from the doc package to main package.
Conflicts: %{name}%{?_isa} <= 3.20.1
%description doc %description doc
This package contains documentation for %{name}. This package contains documentation for %{name}.
@ -531,6 +531,9 @@ popd
%changelog %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 * Thu Jul 01 2021 sguelton@redhat.com - 3.20.2-5
- libdl patch after glibc update (#1975096) - libdl patch after glibc update (#1975096)