dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-monotone-0.45.tar.gz

.gitignore

@@ -0,0 +1 @@
+monotone-0.46.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: monotone
-# $Id$
-NAME := monotone
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1,7 +0,0 @@
-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
-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.45-ls-output.patch

@@ -1,9 +0,0 @@
-============================================================
---- tests/key_files_created_securely/__driver__.lua	63a9bd279770dc1fcefec5eb6cead7fd3e061982
-+++ tests/key_files_created_securely/__driver__.lua	2a0d5d0376174967369a15795f30a6e081af81b6
-@@ -25,4 +25,4 @@ check({ "ls", "-l", "keys/foobar." .. ke
- keyid = string.sub(line, 0, 40)
- 
- check({ "ls", "-l", "keys/foobar." .. keyid }, 0, true, nil)
--check(qgrep("^-rw------- .*keys/foobar." .. keyid, "stdout"))
-+check(qgrep("^-rw-------[.+]? .*keys/foobar." .. keyid, "stdout"))

monotone-0.46-netsync_large_file.patch

@@ -0,0 +1,36 @@
+#
+#
+# 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)

monotone.spec

@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.45
+Version: 0.46
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -11,7 +11,7 @@ Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz
 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,16 @@ fi
 
 
 %changelog
+* Sat Jan 23 2010 Thomas Moschny <thomas.moschny@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@redhat.com> - 0.45-2
+- rebuild against perl 5.10.1
+
 * Sat Sep 12 2009 Thomas Moschny <thomas.moschny@gmx.de> - 0.45-1
 - Update to 0.45.
 

sources

@@ -1 +1 @@
-bd37c3d75e3fd1974a17f556499b42ab  monotone-0.45.tar.gz
+405286223efcf375cd022dabf2f1c845  monotone-0.46.tar.gz