rpms/ikiwiki/devel ikiwiki-libexecdir.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 ikiwiki.spec, 1.45, 1.46 import.log, 1.40, 1.41 sources, 1.40, 1.41 ikiwiki-3.00-libexecdir.patch, 1.1, NONE

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11028/devel

Modified Files:
	.cvsignore ikiwiki.spec import.log sources 
Added Files:
	ikiwiki-libexecdir.patch 
Removed Files:
	ikiwiki-3.00-libexecdir.patch 
Log Message:
Update to 3.20100623.

ikiwiki-libexecdir.patch:
 IkiWiki.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ikiwiki-libexecdir.patch ---
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") {
+	                 "$installdir/libexec/ikiwiki") {
 		if (defined $dir && -x "$dir/plugins/$plugin") {
 			eval { require IkiWiki::Plugin::external };
 			if ($@) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	23 Jun 2010 21:03:51 -0000	1.40
+++ .cvsignore	2 Jul 2010 08:34:35 -0000	1.41
@@ -1 +1 @@
-ikiwiki_3.20100610.tar.gz
+ikiwiki_3.20100623.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/ikiwiki.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- ikiwiki.spec	23 Jun 2010 21:03:51 -0000	1.45
+++ ikiwiki.spec	2 Jul 2010 08:34:35 -0000	1.46
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        3.20100610
+Version:        3.20100623
 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,10 @@ meta-wrapper in this package.
 
 
 %changelog
+* 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.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/import.log,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- import.log	23 Jun 2010 21:03:51 -0000	1.40
+++ import.log	2 Jul 2010 08:34:35 -0000	1.41
@@ -38,3 +38,4 @@ ikiwiki-3_20100501-1_fc12:HEAD:ikiwiki-3
 ikiwiki-3_20100504-1_fc12:HEAD:ikiwiki-3.20100504-1.fc12.src.rpm:1273345931
 ikiwiki-3_20100518_2-1_fc13:HEAD:ikiwiki-3.20100518.2-1.fc13.src.rpm:1275209197
 ikiwiki-3_20100610-1_fc13:HEAD:ikiwiki-3.20100610-1.fc13.src.rpm:1277326994
+ikiwiki-3_20100623-1_fc13:HEAD:ikiwiki-3.20100623-1.fc13.src.rpm:1278059637


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	23 Jun 2010 21:03:51 -0000	1.40
+++ sources	2 Jul 2010 08:34:35 -0000	1.41
@@ -1 +1 @@
-034107c8ba632f8fc5cc178d255c56d7  ikiwiki_3.20100610.tar.gz
+be6f0e289d33211614593d44608f5a86  ikiwiki_3.20100623.tar.gz


--- ikiwiki-3.00-libexecdir.patch DELETED ---