rpms/monotone/devel monotone-0.42-netsync2.patch, NONE, 1.1 import.log, 1.3, 1.4 monotone.spec, 1.43, 1.44

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/monotone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24067/devel

Modified Files:
	import.log monotone.spec 
Added Files:
	monotone-0.42-netsync2.patch 
Log Message:
Add one more netsync related patch from trunk.

monotone-0.42-netsync2.patch:

--- NEW FILE monotone-0.42-netsync2.patch ---
diff -up monotone-0.42/netsync.cc.orig monotone-0.42/netsync.cc
--- monotone-0.42/netsync.cc.orig	2008-12-14 00:02:12.000000000 +0100
+++ monotone-0.42/netsync.cc	2009-02-27 19:19:37.000000000 +0100
@@ -374,7 +374,7 @@ protected:
   }
   bool output_overfull() const
   {
-    return outbuf.size() > constants::bufsz * 10;
+    return outbuf_size > constants::bufsz * 10;
   }
 public:
   string peer_id;


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	9 Feb 2009 15:15:02 -0000	1.3
+++ import.log	27 Feb 2009 20:05:58 -0000	1.4
@@ -1,3 +1,4 @@
 monotone-0_42-1_fc10:HEAD:monotone-0.42-1.fc10.src.rpm:1230916116
 monotone-0_42-2_fc10:HEAD:monotone-0.42-2.fc10.src.rpm:1230932958
 monotone-0_42-3_fc10:HEAD:monotone-0.42-3.fc10.src.rpm:1234192456
+monotone-0_42-5_fc10:HEAD:monotone-0.42-5.fc10.src.rpm:1235765112


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- monotone.spec	26 Feb 2009 02:40:00 -0000	1.43
+++ monotone.spec	27 Feb 2009 20:05:58 -0000	1.44
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.42
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -16,6 +16,8 @@
 Patch0: monotone-0.42-netsync.patch
 # rediffed changesets 33022690.. and 76e258cb.. from upstream
 Patch1: monotone-0.42-gcc44.patch
+# rediffed changeset 16184688.. from upstream
+Patch2: monotone-0.42-netsync2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +80,7 @@
 %setup -q
 %patch0 -p1 -b .gcc44
 %patch1 -p1 -b .netsync
+%patch2 -p1 -b .netsync2
 
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
@@ -205,6 +208,9 @@
 
 
 %changelog
+* Fri Feb 27 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.42-5
+- Add one more netsync related patch from trunk.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.42-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild