[fedora-release/f21] fix license handling
Tom Callaway
spot at fedoraproject.org
Sat Jul 12 14:43:39 UTC 2014
commit dc5624e0977c891d476bde5db89c72075675822c
Author: Tom Callaway <spot at fedoraproject.org>
Date: Sat Jul 12 10:43:57 2014 -0400
fix license handling
fedora-release.spec | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/fedora-release.spec b/fedora-release.spec
index 673fef3..47310e1 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -5,7 +5,7 @@
Summary: Fedora release files
Name: fedora-release
Version: 21
-Release: 0.9
+Release: 0.10
License: MIT
Group: System Environment/Base
URL: http://fedoraproject.org
@@ -121,7 +121,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc LICENSE Fedora-Legal-README.txt
+%{!?_licensedir:%global license %%doc}
+%license LICENSE Fedora-Legal-README.txt
%config %attr(0644,root,root) /etc/os-release
%config %attr(0644,root,root) /etc/fedora-release
/etc/redhat-release
@@ -132,18 +133,25 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644,root,root) %{_rpmconfigdir}/macros.d/macros.dist
%files standard
-%doc LICENSE
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
%files cloud
-%doc LICENSE
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
%files server
-%doc LICENSE
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
%files workstation
-%doc LICENSE
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
%changelog
+* Sat Jul 12 2014 Tom Callaway <spot at fedoraproject.org> - 21-0.10
+- fix license handling
+
* Tue Jul 08 2014 Dennis Gilmore <dennis at ausil.us> - 21-0.9
- setup for f21 being branched
More information about the scm-commits
mailing list