rpms/cmake
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix conflicting license files in cmake and cmake-doc

Browse Source 
Related: RHEL-65234
This commit is contained in:
Tom Stellard 2024-11-04 21:45:17 -08:00
parent f7424ab464
commit 071ae11c45
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake.spec
View File

@ -72,7 +72,7 @@
%global patch_version 5
# For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 1
%global baserelease 2
# Set to RC version if building RC, else comment out.
#%%global rcsuf rc3
@ -515,9 +515,12 @@ popd
%files doc
# Pickup license-files from main-pkg's license-dir
# If there's no license-dir they are picked up by %%doc previously
%{?_licensedir:%license %{_datadir}/licenses/%{name}*}
%license Copyright.txt*
%license COPYING*
%if %{with bundled_cppdap}
%license LICENSE.cppdap
%license NOTICE.cppdap
%endif
%doc %{_pkgdocdir}
@ -549,6 +552,9 @@ popd
%changelog
* Tue Nov 05 2024 Tom Stellard <tstellar@redhat.com> - 3.30.5-2
- Fix conflicting license files in cmake and cmake-doc
* Tue Oct 29 2024 Tom Stellard <tstellar@redhat.com> - 3.30.5-1
- Update version to 3.30.5