[fedora-release] fix license handling
Tom Callaway
spot at fedoraproject.org
Sat Jul 12 14:42:01 UTC 2014
commit cf296ee19333c75138cb8f1c20d271242a76af5c
Author: Tom Callaway <spot at fedoraproject.org>
Date: Sat Jul 12 10:42:21 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 d1c7aac..f6b09ab 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -5,7 +5,7 @@
Summary: Fedora release files
Name: fedora-release
Version: 22
-Release: 0.1
+Release: 0.2
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> 22-0.2
+- fix license handling
+
* Tue Jul 08 2014 Dennis Gilmore <dennis at ausil.us> 22-0.1
- setup for rawhide targetiing f22
More information about the scm-commits
mailing list