rpms/monotone/devel monotone-0.46-netsync_large_file.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 import.log, 1.7, 1.8 monotone.spec, 1.50, 1.51 sources, 1.25, 1.26 monotone-0.45-ls-output.patch, 1.1, NONE
Thomas Moschny
thm at fedoraproject.org
Sat Jan 23 22:10:02 UTC 2010
Author: thm
Update of /cvs/pkgs/rpms/monotone/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4280/devel
Modified Files:
.cvsignore import.log monotone.spec sources
Added Files:
monotone-0.46-netsync_large_file.patch
Removed Files:
monotone-0.45-ls-output.patch
Log Message:
Update to 0.46.
monotone-0.46-netsync_large_file.patch:
socket.cxx | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
--- NEW FILE monotone-0.46-netsync_large_file.patch ---
#
#
# patch "netxx/socket.cxx"
# from [ca9a59bb394a41f6aae1527678162678d5e60419]
# to [16b61df71104d616a1dc68adc6da02160ce1714a]
#
============================================================
--- netxx/socket.cxx ca9a59bb394a41f6aae1527678162678d5e60419
+++ netxx/socket.cxx 16b61df71104d616a1dc68adc6da02160ce1714a
@@ -172,9 +172,9 @@ Netxx::signed_size_type Netxx::Socket::w
Netxx::signed_size_type Netxx::Socket::write (const void *buffer, size_type length, const Timeout &timeout)
{
const char *buffer_ptr = static_cast<const char*>(buffer);
- signed_size_type rc, bytes_written=0;
+ signed_size_type rc;
- while (length) {
+ for (;;) {
if (timeout && !writable(timeout)) return -1;
if ( (rc = send(socketfd_, buffer_ptr, length, 0)) < 0) {
@@ -213,12 +213,10 @@ Netxx::signed_size_type Netxx::Socket::w
}
}
- buffer_ptr += rc;
- bytes_written += rc;
- length -= rc;
+ break;
}
- return bytes_written;
+ return rc;
}
//####################################################################
Netxx::signed_size_type Netxx::Socket::read (void *buffer, size_type length, const Timeout &timeout)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore 13 Sep 2009 10:03:48 -0000 1.25
+++ .cvsignore 23 Jan 2010 22:10:00 -0000 1.26
@@ -1 +1 @@
-monotone-0.45.tar.gz
+monotone-0.46.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log 13 Sep 2009 10:03:48 -0000 1.7
+++ import.log 23 Jan 2010 22:10:01 -0000 1.8
@@ -5,3 +5,4 @@ monotone-0_42-5_fc10:HEAD:monotone-0.42-
monotone-0_43-1_fc10:HEAD:monotone-0.43-1.fc10.src.rpm:1238237776
monotone-0_44-1_fc11:HEAD:monotone-0.44-1.fc11.src.rpm:1242410660
monotone-0_45-1_fc11:HEAD:monotone-0.45-1.fc11.src.rpm:1252835264
+monotone-0_46-1_fc12:HEAD:monotone-0.46-1.fc12.src.rpm:1264284544
Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- monotone.spec 7 Dec 2009 17:43:32 -0000 1.50
+++ monotone.spec 23 Jan 2010 22:10:01 -0000 1.51
@@ -1,6 +1,6 @@
Name: monotone
-Version: 0.45
-Release: 2%{?dist}
+Version: 0.46
+Release: 1%{?dist}
Summary: A free, distributed version control system
Group: Development/Tools
@@ -11,7 +11,7 @@ Source0: http://monotone.ca/downloads/%{
Source1: monotone.init
Source2: monotone.sysconfig
Source3: README.monotone-server
-Patch0: monotone-0.45-ls-output.patch
+Patch0: monotone-0.46-netsync_large_file.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -65,22 +65,20 @@ and then pass commands to it.
%prep
%setup -q
-%patch0 -p0 -b .ls-output
+%patch0 -p0 -b .netsync-large-file
%build
-%configure --with-bundled-lua=%{bundled_lua} \
- --with-bundled-sqlite=%{bundled_sqlite}
+%configure
make %{?_smp_mflags}
%check
-# disable parallel runs in the testsuite for now
-make check || { cat tester_dir/*.log; false; }
+make check %{?_smp_mflags} || { cat tester_dir/*.log; false; }
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_infodir}/dir
-rm -f %{buildroot}%{_datadir}/doc/monotone/monotone.html
+mv %{buildroot}%{_datadir}/doc/%{name} _doc
%find_lang %{name}
@@ -139,8 +137,7 @@ fi
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE
-%doc monotone.html
-
+%doc _doc/*
%{_bindir}/mtn
%{_bindir}/mtnopt
%{_infodir}/monotone.info*
@@ -193,6 +190,13 @@ fi
%changelog
+* Sat Jan 23 2010 Thomas Moschny <thomas.moschny at gmx.de> - 0.46-1
+- Update to 0.46.
+- Remove patch applied upstream
+- Add patch from trunk for failing test.
+- Fix installation of documentation: include figures in the package.
+- Let tests in the testsuite run in parallel.
+
* Mon Dec 7 2009 Stepan Kasal <skasal at redhat.com> - 0.45-2
- rebuild against perl 5.10.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources 13 Sep 2009 10:03:48 -0000 1.25
+++ sources 23 Jan 2010 22:10:02 -0000 1.26
@@ -1 +1 @@
-bd37c3d75e3fd1974a17f556499b42ab monotone-0.45.tar.gz
+405286223efcf375cd022dabf2f1c845 monotone-0.46.tar.gz
--- monotone-0.45-ls-output.patch DELETED ---
More information about the scm-commits
mailing list