[ikiwiki/f13/master] Update to 3.20100722.
Thomas Moschny
thm at fedoraproject.org
Fri Jul 30 11:09:08 UTC 2010
commit 5e2163eb5c13895b564fbd455aa8e8ee705887a4
Author: Thomas Moschny <thm at fedoraproject.org>
Date: Fri Jul 30 13:08:40 2010 +0200
Update to 3.20100722.
.gitignore | 1 +
...00-libexecdir.patch => ikiwiki-libexecdir.patch | 11 ++++++-----
ikiwiki.spec | 20 ++++++++++++++++++--
sources | 2 +-
4 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ac1159..5719a39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
ikiwiki_3.20100504.tar.gz
+ikiwiki_3.20100722.tar.gz
diff --git a/ikiwiki-3.00-libexecdir.patch b/ikiwiki-libexecdir.patch
similarity index 52%
rename from ikiwiki-3.00-libexecdir.patch
rename to ikiwiki-libexecdir.patch
index f7dc7d5..240a560 100644
--- a/ikiwiki-3.00-libexecdir.patch
+++ b/ikiwiki-libexecdir.patch
@@ -1,8 +1,9 @@
-diff -up ikiwiki/IkiWiki.pm.orig ikiwiki/IkiWiki.pm
---- ikiwiki/IkiWiki.pm.orig 2008-12-31 19:33:10.000000000 +0100
-+++ ikiwiki/IkiWiki.pm 2009-01-02 12:55:15.000000000 +0100
-@@ -547,7 +547,7 @@ sub loadplugin ($) {
- return if grep { $_ eq $plugin} @{$config{disable_plugins}};
+diff --git a/IkiWiki.pm b/IkiWiki.pm
+index 203da3b..4725d80 100644
+--- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -599,7 +599,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") {
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 4b523d5..7c2e788 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
Name: ikiwiki
-Version: 3.20100504
+Version: 3.20100722
Release: 1%{?dist}
Summary: A wiki compiler
@@ -7,7 +7,7 @@ Group: Applications/Internet
License: GPLv2+
URL: http://ikiwiki.info/
Source0: http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
-Patch0: ikiwiki-3.00-libexecdir.patch
+Patch0: ikiwiki-libexecdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -144,6 +144,22 @@ meta-wrapper in this package.
%changelog
+* Fri Jul 30 2010 Thomas Moschny <thomas.moschny at gmx.de> - 3.20100722-1
+- Update to 3.20100722.
+
+* Fri Jul 2 2010 Thomas Moschny <thomas.moschny at gmx.de> - 3.20100623-1
+- Rebase libexecdir patch.
+- Update to 3.20100623.
+
+* Wed Jun 23 2010 Thomas Moschny <thomas.moschny at gmx.de> - 3.20100610-1
+- Update to 3.20100610.
+
+* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 3.20100518.2-2
+- Mass rebuild with perl-5.12.0
+
+* Sun May 30 2010 Thomas Moschny <thomas.moschny at gmx.de> - 3.20100518.2-1
+- Update to 3.20100518.2.
+
* Sat May 8 2010 Thomas Moschny <thomas.moschny at gmx.de> - 3.20100504-1
- Update to 3.20100504.
diff --git a/sources b/sources
index 45859d3..49be071 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df3999783fdb4e1a7a12c6d631ac1122 ikiwiki_3.20100504.tar.gz
+c2aa8e0d602efdc7a3e94a81b9465348 ikiwiki_3.20100722.tar.gz
More information about the scm-commits
mailing list