rpms/ikiwiki/F-10 ikiwiki-2.70-mtn.patch, NONE, 1.1 ikiwiki.spec, 1.10, 1.11 import.log, 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-serv9353/F-10

Modified Files:
	ikiwiki.spec import.log 
Added Files:
	ikiwiki-2.70-mtn.patch 
Log Message:
- Patch for monotone plugin: Prevent broken pipe message.
- Cosmetic changes to satisfy rpmlint.


ikiwiki-2.70-mtn.patch:

--- NEW FILE ikiwiki-2.70-mtn.patch ---
diff -up ikiwiki/IkiWiki/Plugin/monotone.pm.orig ikiwiki/IkiWiki/Plugin/monotone.pm
--- ikiwiki/IkiWiki/Plugin/monotone.pm.orig	2008-11-12 23:45:24.000000000 +0100
+++ ikiwiki/IkiWiki/Plugin/monotone.pm	2008-12-16 12:41:38.000000000 +0100
@@ -525,13 +525,12 @@ sub rcs_recentchanges ($) { #{{{
 	my $child = open(MTNLOG, "-|");
 	if (! $child) {
 		exec("mtn", "log", "--root=$config{mtnrootdir}", "--no-graph",
-		     "--brief") || error("mtn log failed to run");
+		     "--brief", "--last=$num") || error("mtn log failed to run");
 	}
 
-	while (($num >= 0) and (my $line = <MTNLOG>)) {
+	while (my $line = <MTNLOG>) {
 		if ($line =~ m/^($sha1_pattern)/) {
 			push @revs, $1;
-			$num -= 1;
 		}
 	}
 	close MTNLOG || debug("mtn log exited $?");


Index: ikiwiki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/ikiwiki.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ikiwiki.spec	20 Nov 2008 21:26:51 -0000	1.10
+++ ikiwiki.spec	19 Dec 2008 15:44:54 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           ikiwiki
 Version:        2.70
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A wiki compiler
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@
 URL:            http://ikiwiki.info/
 Source0:        http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz
 Patch0:         ikiwiki-2.70-libexecdir.patch
+Patch1:         ikiwiki-2.70-mtn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -49,6 +50,7 @@
 %prep
 %setup0 -q -n %{name}
 %patch0 -p1 -b .libexecdir
+%patch1 -p1
 
 # Filter unwanted Provides:
 %{__cat} << \EOF > %{name}-prov
@@ -109,6 +111,8 @@
 # remove shebang
 %{__sed} -e '1{/^#!/d}' -i \
         %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup
+%{__sed} -e '1{/^#!/d}' -i \
+        %{buildroot}%{_libexecdir}/ikiwiki/plugins/proxy.py
 
 
 %clean
@@ -153,6 +157,13 @@
 
 
 %changelog
+* Tue Dec 16 2008 Thomas Moschny <thomas.moschny at gmx.de> - 2.70-3
+- Patch for monotone plugin: Prevent broken pipe message.
+- Cosmetic changes to satisfy rpmlint.
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.70-2
+- Rebuild for Python 2.6
+
 * 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.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ikiwiki/F-10/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	20 Nov 2008 21:26:51 -0000	1.10
+++ import.log	19 Dec 2008 15:44:54 -0000	1.11
@@ -8,3 +8,4 @@
 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
+ikiwiki-2_70-3_fc10:F-10:ikiwiki-2.70-3.fc10.src.rpm:1229701432