rpms/ikiwiki/F-10 ikiwiki-2.70-libexecdir.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 ikiwiki.spec, 1.9, 1.10 import.log, 1.9, 1.10 sources, 1.10, 1.11

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/ikiwiki/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14446/F-10

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

ikiwiki-2.70-libexecdir.patch:

--- NEW FILE ikiwiki-2.70-libexecdir.patch ---
diff -up ikiwiki/IkiWiki.pm.orig ikiwiki/IkiWiki.pm
--- ikiwiki/IkiWiki.pm.orig	2008-11-12 23:45:24.000000000 +0100
+++ ikiwiki/IkiWiki.pm	2008-11-20 16:58:35.000000000 +0100
@@ -540,7 +540,7 @@ sub loadplugin ($) { #{{{
 	return if 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/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Sep 2008 08:32:57 -0000	1.10
+++ .cvsignore	20 Nov 2008 21:26:51 -0000	1.11
@@ -1 +1 @@
-ikiwiki_2.64.tar.gz
+ikiwiki_2.70.tar.gz


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/ikiwiki.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ikiwiki.spec	19 Sep 2008 08:32:57 -0000	1.9
+++ ikiwiki.spec	20 Nov 2008 21:26:51 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version:        2.64
+Version:        2.70
 Release:        1%{?dist}
 Summary:        A wiki compiler
 
@@ -7,6 +7,7 @@
 License:        GPLv2+
 URL:            http://ikiwiki.info/
 Source0:        http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
+Patch0:         ikiwiki-2.70-libexecdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -32,6 +33,8 @@
 Requires:       perl(CGI::Session)
 Requires:       perl(Digest::SHA1)
 
+Requires:       python-docutils
+
 %define cgi_bin %{_libexecdir}/w3m/cgi-bin
 
 
@@ -44,7 +47,8 @@
 
 
 %prep
-%setup -q -n %{name}
+%setup0 -q -n %{name}
+%patch0 -p1 -b .libexecdir
 
 # Filter unwanted Provides:
 %{__cat} << \EOF > %{name}-prov
@@ -58,14 +62,11 @@
 
 # Filter Requires, all used by plugins
 # - Monotone: see bz 450267
-# - RPC::XML: see bz 459933
 %{__cat} << \EOF > %{name}-req
 #!/bin/sh
 %{__perl_requires} $* |\
   %{__sed} -e '/perl(IkiWiki.*)/d' \
-           -e '/perl(Monotone)/d' \
-           -e '/perl(RPC::XML)/d' \
-           -e '/perl(RPC::XML::Parser)/d'
+           -e '/perl(Monotone)/d'
 EOF
 
 %define __perl_requires %{_builddir}/%{name}/%{name}-req
@@ -93,6 +94,11 @@
 %{__mv} %{buildroot}%{_prefix}/lib/w3m/cgi-bin/ikiwiki-w3m.cgi \
         %{buildroot}%{cgi_bin}
 
+# move external plugins
+%{__mkdir_p} %{buildroot}%{_libexecdir}/ikiwiki/plugins
+%{__mv} %{buildroot}%{_prefix}/lib/ikiwiki/plugins/* \
+        %{buildroot}%{_libexecdir}/ikiwiki/plugins
+
 # fix encoding
 iconv -f iso-8859-9 -t utf-8 \
       html/tips/vim_syntax_highlighting/ikiwiki.vim \
@@ -104,6 +110,7 @@
 %{__sed} -e '1{/^#!/d}' -i \
         %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup
 
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -121,8 +128,7 @@
 %exclude %{perl_vendorarch}
 %{perl_vendorlib}/IkiWiki*
 %exclude %{perl_vendorlib}/IkiWiki*/Plugin/skeleton.pm.example
-# directory for external (non-perl) plugins, needs RPC::XML
-%exclude %{_prefix}/lib/ikiwiki/plugins/*
+%{_libexecdir}/ikiwiki
 %doc README debian/changelog debian/NEWS html
 %doc IkiWiki/Plugin/skeleton.pm.example
 
@@ -147,6 +153,14 @@
 
 
 %changelog
+* Thu Nov 20 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.70-1
+- Update to 2.70.
+- Install and enable the external rst plugin.
+- Stop filtering perl(RPC::XML*) requires.
+
+* Fri Oct 10 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.66-1
+- Update to 2.66.
+
 * Fri Sep 19 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.64-1
 - Update to 2.64.
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	19 Sep 2008 08:32:57 -0000	1.9
+++ import.log	20 Nov 2008 21:26:51 -0000	1.10
@@ -7,3 +7,4 @@
 ikiwiki-2_62_1-1_fc9:HEAD:ikiwiki-2.62.1-1.fc9.src.rpm:1220114514
 ikiwiki-2_63-1_fc9:HEAD:ikiwiki-2.63-1.fc9.src.rpm:1221122510
 ikiwiki-2_64-1_fc9:HEAD:ikiwiki-2.64-1.fc9.src.rpm:1221813107
+ikiwiki-2_70-1_fc9:F-10:ikiwiki-2.70-1.fc9.src.rpm:1227216329


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	19 Sep 2008 08:32:57 -0000	1.10
+++ sources	20 Nov 2008 21:26:51 -0000	1.11
@@ -1 +1 @@
-465a1041ac266f9fca5e95615f15b766  ikiwiki_2.64.tar.gz
+43d9dc1a5e03e38dd829cd4d4a38eeb4  ikiwiki_2.70.tar.gz