[python-iniparse] fix license handling

Tom Callaway spot at fedoraproject.org
Thu Jul 31 14:35:16 UTC 2014


commit 4012c54b59cc8b8343a431ea90546f96d749e9c9
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Jul 31 10:35:09 2014 -0400

    fix license handling

 python-iniparse.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/python-iniparse.spec b/python-iniparse.spec
index dd36720..b363b6b 100644
--- a/python-iniparse.spec
+++ b/python-iniparse.spec
@@ -5,10 +5,10 @@
 
 Name:           python-iniparse
 Version:        0.4
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Python Module for Accessing and Modifying Configuration Data in INI files
 Group:          Development/Libraries
-License:        MIT
+License:        MIT and Python
 URL:            http://code.google.com/p/iniparse/
 Source0:        http://iniparse.googlecode.com/files/iniparse-%{version}.tar.gz
 Patch0:         fix-issue-28.patch
@@ -89,6 +89,10 @@ popd
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT/usr/share/doc/iniparse-%{version} $RPM_BUILD_ROOT%{_pkgdocdir}
 
+# Don't dupe the license
+rm -rf $RPM_BUILD_ROOT%{_pkgdocdir}/LICENSE*
+rm -rf $RPM_BUILD_ROOT%{_docdir}/python3-iniparse/LICENSE*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -104,17 +108,24 @@ popd
 %files
 %defattr(-,root,root,-)
 %doc %{_pkgdocdir}
+%{!?_licensedir:%global license %%doc}
+%license LICENSE LICENSE-PSF
 %{python_sitelib}/*
 
 %if 0%{?with_python3}
 %files -n python3-iniparse
 %defattr(-,root,root,-)
 %doc %{_docdir}/python3-iniparse
+%{!?_licensedir:%global license %%doc}
+%license LICENSE LICENSE-PSF
 %{python3_sitelib}/*
 %endif
 
 
 %changelog
+* Thu Jul 31 2014 Tom Callaway <spot at fedoraproject.org> - 0.4-15
+- fix license handling
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list