[ikiwiki] Update license tag. Add BR on Python to ensure the Python plugin gets byte-compiled. Add runtime dep

Thomas Moschny thm at fedoraproject.org
Sat Jul 23 11:51:24 UTC 2011


commit e3f65c253786a54ba69e5155884b8dde321e798c
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sat Jul 23 13:50:55 2011 +0200

    Update license tag.
    Add BR on Python to ensure the Python plugin gets byte-compiled.
    Add runtime dependency on Python.

 ikiwiki.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 4c1263d..a09225a 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,10 +1,12 @@
 Name:           ikiwiki
 Version:        3.20110715
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
-License:        GPLv2+
+# ikiwiki is licensed under GPLv2+, the Python code in plugins/ under
+# BSD (2-clause)
+License:        GPLv2+ and BSD
 URL:            http://ikiwiki.info/
 Source0:        http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
 Patch0:         ikiwiki-libexecdir.patch
@@ -24,6 +26,7 @@ BuildRequires:  perl(File::MimeInfo)
 BuildRequires:  perl(YAML)
 BuildRequires:  gettext
 BuildRequires:  po4a
+BuildRequires:  python
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -35,6 +38,7 @@ Requires:       perl(CGI::FormBuilder)
 Requires:       perl(CGI::Session)
 Requires:       perl(Digest::SHA1)
 
+Requires:       python(abi) = %{python_version}
 Requires:       python-docutils
 
 %global cgi_bin %{_libexecdir}/w3m/cgi-bin
@@ -136,6 +140,11 @@ meta-wrapper in this package.
 
 
 %changelog
+* Sat Jul 23 2011 Thomas Moschny <thomas.moschny at gmx.de> - 3.20110715-3
+- Update license tag.
+- Add BR on Python to ensure the Python plugin gets byte-compiled.
+- Add runtime dependency on Python.
+
 * Fri Jul 22 2011 Petr Pisar <ppisar at redhat.com> - 3.20110715-2
 - RPM 4.9 dependency filtering added
 


More information about the scm-commits mailing list