thm pushed to ikiwiki (f20). "Update to 3.20150329. (..more)"

[notifications at fedoraproject.org]

>From 764e0a182c2472218bb5c2ed9b23db950074f21b Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm at fedoraproject.org>
Date: Thu, 23 Apr 2015 19:00:13 +0200
Subject: Update to 3.20150329.

- Minor packaging changes regarding the Python plugin.

diff --git a/.gitignore b/.gitignore
index 2f8fad1..ce258c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,4 @@
 /ikiwiki_3.20140916.tar.gz
 /ikiwiki_3.20141016.tar.gz
 /ikiwiki_3.20150107.tar.gz
+/ikiwiki_3.20150329.tar.gz
diff --git a/ikiwiki.spec b/ikiwiki.spec
index c8ca9a0..845df63 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.20150107
+Version:        3.20150329
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -27,7 +27,7 @@ BuildRequires:  perl(File::MimeInfo)
 BuildRequires:  perl(YAML::XS)
 BuildRequires:  gettext
 BuildRequires:  po4a
-BuildRequires:  python
+BuildRequires:  python2-devel
 
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -40,7 +40,9 @@ Requires:       perl(CGI::Session)
 Requires:       perl(Digest::SHA1)
 Requires:       perl(YAML::XS)
 
-Requires:       python(abi) %(%{__python} -c "import sys ; print \"=\", sys.version[:3]")
+%if "%{?python2_version}" != ""
+Requires:       python(abi) = %{python2_version}
+%endif
 Requires:       python-docutils
 
 %global cgi_bin %{_libexecdir}/w3m/cgi-bin
@@ -92,7 +94,12 @@ mv %{buildroot}%{_prefix}/lib/ikiwiki/plugins/* \
 sed -e '1{/^#!/d}' -i \
     %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup \
     %{buildroot}%{_sysconfdir}/ikiwiki/auto-blog.setup \
-    %{buildroot}%{_libexecdir}/ikiwiki/plugins/proxy.py
+    %{buildroot}%{_libexecdir}/ikiwiki/plugins/proxy.py \
+    %{buildroot}%{_libexecdir}/ikiwiki/plugins/rst
+
+# fix shebang
+sed -e '1i#!%{__python2}' -i \
+    %{buildroot}%{_libexecdir}/ikiwiki/plugins/rst
 
 # fix permissions
 find %{buildroot}%{perl_vendorlib}/IkiWiki -type f \
@@ -140,6 +147,10 @@ meta-wrapper in this package.
 
 
 %changelog
+* Mon Apr 20 2015 Thomas Moschny <thomas.moschny at gmx.de> - 3.20150329-1
+- Update to 3.20150329.
+- Minor packaging changes regarding the Python plugin.
+
 * Sun Feb 22 2015 Thomas Moschny <thomas.moschny at gmx.de> - 3.20150107-1
 - Update to 3.20150107.
 
diff --git a/sources b/sources
index 30b3562..e24b06a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db45b1b3d50d0448e4d33be132580334  ikiwiki_3.20150107.tar.gz
+99ccfbca19be4ba6a67487607f62609e  ikiwiki_3.20150329.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ikiwiki.git/commit/?h=f20&id=764e0a182c2472218bb5c2ed9b23db950074f21b