[keyutils/f21] fix license handling

Tom Callaway spot at fedoraproject.org
Sat Jul 12 22:31:39 UTC 2014


commit 62423d3b73d16f4f747e58d8d4a4b4c53023499f
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Sat Jul 12 18:31:59 2014 -0400

    fix license handling

 keyutils.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/keyutils.spec b/keyutils.spec
index f4e8045..b064463 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -9,7 +9,7 @@
 Summary: Linux Key Management Utilities
 Name: keyutils
 Version: %{version}
-Release: 2%{?buildid}%{?dist}
+Release: 3%{?buildid}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Base
 ExclusiveOS: Linux
@@ -85,7 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README LICENCE.GPL
+%doc README
+%{!?_licensedir:%global license %%doc}
+%license LICENCE.GPL
 %{_sbindir}/*
 %{_bindir}/*
 %{datadir}
@@ -96,7 +98,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(-,root,root,-)
-%doc LICENCE.LGPL
+%{!?_licensedir:%global license %%doc}
+%license LICENCE.LGPL
 %{_mandir}/man7/*
 %{_libdir}/libkeyutils.so.%{libapiversion}
 %{_libdir}/libkeyutils.so.%{libapivermajor}
@@ -108,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jul 12 2014 Tom Callaway <spot at fedoraproject.org> - 1.5.9-3
+- fix license handling
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list