[ikiwiki] Update to 3.20150107.

Thomas Moschny thm at fedoraproject.org
Sun Feb 22 23:41:55 UTC 2015


commit 22e73b5a8a7b142e15c9e0d4bb13527e989f08ab
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Mon Feb 23 00:38:45 2015 +0100

    Update to 3.20150107.

 .gitignore               |  1 +
 ikiwiki-libexecdir.patch | 17 ++++++++---------
 ikiwiki.spec             |  5 ++++-
 sources                  |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ad443aa..2f8fad1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@
 /ikiwiki_3.20140831.tar.gz
 /ikiwiki_3.20140916.tar.gz
 /ikiwiki_3.20141016.tar.gz
+/ikiwiki_3.20150107.tar.gz
diff --git a/ikiwiki-libexecdir.patch b/ikiwiki-libexecdir.patch
index 240a560..60d30c2 100644
--- a/ikiwiki-libexecdir.patch
+++ b/ikiwiki-libexecdir.patch
@@ -1,13 +1,12 @@
-diff --git a/IkiWiki.pm b/IkiWiki.pm
-index 203da3b..4725d80 100644
---- a/IkiWiki.pm
-+++ b/IkiWiki.pm
-@@ -599,7 +599,7 @@ sub loadplugin ($;$) {
+diff -up ikiwiki/IkiWiki.pm.orig ikiwiki/IkiWiki.pm
+--- ikiwiki/IkiWiki.pm.orig	2014-12-16 09:11:12.000000000 +0100
++++ ikiwiki/IkiWiki.pm	2015-02-23 00:26:11.553052577 +0100
+@@ -773,7 +773,7 @@ sub loadplugin ($;$) {
+ 
  	return if ! $force && grep { $_ eq $plugin} @{$config{disable_plugins}};
  
- 	foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
--	                 "$installdir/lib/ikiwiki") {
-+	                 "$installdir/libexec/ikiwiki") {
+-	foreach my $possiblytainteddir (getlibdirs(), "$installdir/lib/ikiwiki") {
++	foreach my $possiblytainteddir (getlibdirs(), "$installdir/libexec/ikiwiki") {
+ 		my $dir = possibly_foolish_untaint($possiblytainteddir);
  		if (defined $dir && -x "$dir/plugins/$plugin") {
  			eval { require IkiWiki::Plugin::external };
- 			if ($@) {
diff --git a/ikiwiki.spec b/ikiwiki.spec
index c922d62..c8ca9a0 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.20141016
+Version:        3.20150107
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -140,6 +140,9 @@ meta-wrapper in this package.
 
 
 %changelog
+* Sun Feb 22 2015 Thomas Moschny <thomas.moschny at gmx.de> - 3.20150107-1
+- Update to 3.20150107.
+
 * Thu Dec 18 2014 Thomas Moschny <thomas.moschny at gmx.de> - 3.20141016-1
 - Update to 3.20141016.
 
diff --git a/sources b/sources
index ff4d61e..30b3562 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ffe3cceb2ded5beafd316e7f5961a5c  ikiwiki_3.20141016.tar.gz
+db45b1b3d50d0448e4d33be132580334  ikiwiki_3.20150107.tar.gz


More information about the scm-commits mailing list