From 885702ce2b1ad29cb516d79cd0d4037b12704608 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 07:12:53 +0000 Subject: [PATCH 1/6] Initialize branch F-11 for monotone --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 7dc185b4f7082f285c99065499eba1745b25f249 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 18 May 2009 18:04:31 +0000 Subject: [PATCH 2/6] Update to 0.44. --- .cvsignore | 2 +- import.log | 1 + monotone.spec | 8 +++++++- sources | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 57b54ef..044b7fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.43.tar.gz +monotone-0.44.tar.gz diff --git a/import.log b/import.log index 5b19a7d..fafbc24 100644 --- a/import.log +++ b/import.log @@ -3,3 +3,4 @@ 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_fc12:F-11:monotone-0.44-1.fc12.src.rpm:1242669791 diff --git a/monotone.spec b/monotone.spec index 203fa52..be1ce3d 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,5 +1,5 @@ Name: monotone -Version: 0.43 +Version: 0.44 Release: 1%{?dist} Summary: A free, distributed version control system @@ -191,6 +191,12 @@ fi %changelog +* Wed May 13 2009 Thomas Moschny - 0.44-1 +- Update to 0.44. + +* Sat Apr 25 2009 Thomas Moschny - 0.43-2 +- Rebuilt for new botan version. + * Fri Mar 27 2009 Thomas Moschny - 0.43-1 - Update to 0.43. - Add BRs for libraries monotone doesn't bundle anylonger. diff --git a/sources b/sources index 6678497..7419efe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a9e82b899ff7f676f620c450d6aff4cf monotone-0.43.tar.gz +6cc1f5f31df2e41bdfe502310463924a monotone-0.44.tar.gz From be521f6aa44ce5d53a449e433a41861e09ebdb4b Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 13 Sep 2009 16:32:06 +0000 Subject: [PATCH 3/6] Update to 0.45. --- .cvsignore | 2 +- import.log | 1 + monotone-0.45-ls-output.patch | 9 +++++++++ monotone.spec | 10 +++++++++- sources | 2 +- 5 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 monotone-0.45-ls-output.patch diff --git a/.cvsignore b/.cvsignore index 044b7fb..4449a32 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.44.tar.gz +monotone-0.45.tar.gz diff --git a/import.log b/import.log index fafbc24..240f9dc 100644 --- a/import.log +++ b/import.log @@ -4,3 +4,4 @@ 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_fc12:F-11:monotone-0.44-1.fc12.src.rpm:1242669791 +monotone-0_45-1_fc11:F-11:monotone-0.45-1.fc11.src.rpm:1252859489 diff --git a/monotone-0.45-ls-output.patch b/monotone-0.45-ls-output.patch new file mode 100644 index 0000000..da03f38 --- /dev/null +++ b/monotone-0.45-ls-output.patch @@ -0,0 +1,9 @@ +============================================================ +--- 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")) diff --git a/monotone.spec b/monotone.spec index be1ce3d..92ad616 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,5 +1,5 @@ Name: monotone -Version: 0.44 +Version: 0.45 Release: 1%{?dist} Summary: A free, distributed version control system @@ -11,6 +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,6 +65,7 @@ and then pass commands to it. %prep %setup -q +%patch0 -p0 -b .ls-output %build %configure --with-bundled-lua=%{bundled_lua} \ @@ -191,6 +193,12 @@ fi %changelog +* Sat Sep 12 2009 Thomas Moschny - 0.45-1 +- Update to 0.45. + +* Sat Jul 25 2009 Fedora Release Engineering - 0.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed May 13 2009 Thomas Moschny - 0.44-1 - Update to 0.44. diff --git a/sources b/sources index 7419efe..647a075 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6cc1f5f31df2e41bdfe502310463924a monotone-0.44.tar.gz +bd37c3d75e3fd1974a17f556499b42ab monotone-0.45.tar.gz From b5819d35eda5322b1a438d51da03144a0a90f10b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:51 +0000 Subject: [PATCH 4/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 659e999..6fced2f 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: monotone -# $Id$ +# $Id: Makefile,v 1.1 2005/07/18 23:50:55 roland Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5d72150f5c301adfef63db77e5aa953ea9c25e2d Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 24 Jan 2010 07:41:10 +0000 Subject: [PATCH 5/6] Update to 0.46. --- .cvsignore | 2 +- import.log | 1 + monotone-0.45-ls-output.patch | 9 ------- monotone-0.46-netsync_large_file.patch | 36 ++++++++++++++++++++++++++ monotone.spec | 27 ++++++++++++------- sources | 2 +- 6 files changed, 56 insertions(+), 21 deletions(-) delete mode 100644 monotone-0.45-ls-output.patch create mode 100644 monotone-0.46-netsync_large_file.patch diff --git a/.cvsignore b/.cvsignore index 4449a32..c325f79 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.45.tar.gz +monotone-0.46.tar.gz diff --git a/import.log b/import.log index 240f9dc..2ff9996 100644 --- a/import.log +++ b/import.log @@ -5,3 +5,4 @@ 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_fc12:F-11:monotone-0.44-1.fc12.src.rpm:1242669791 monotone-0_45-1_fc11:F-11:monotone-0.45-1.fc11.src.rpm:1252859489 +monotone-0_46-1_fc12:F-11:monotone-0.46-1.fc12.src.rpm:1264318810 diff --git a/monotone-0.45-ls-output.patch b/monotone-0.45-ls-output.patch deleted file mode 100644 index da03f38..0000000 --- a/monotone-0.45-ls-output.patch +++ /dev/null @@ -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")) diff --git a/monotone-0.46-netsync_large_file.patch b/monotone-0.46-netsync_large_file.patch new file mode 100644 index 0000000..f9a9c88 --- /dev/null +++ b/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(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) diff --git a/monotone.spec b/monotone.spec index 92ad616..aaf404b 100644 --- a/monotone.spec +++ b/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 - 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 - 0.45-2 +- rebuild against perl 5.10.1 + * Sat Sep 12 2009 Thomas Moschny - 0.45-1 - Update to 0.45. diff --git a/sources b/sources index 647a075..5070437 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd37c3d75e3fd1974a17f556499b42ab monotone-0.45.tar.gz +405286223efcf375cd022dabf2f1c845 monotone-0.46.tar.gz From f56eaacdb7b0b690ce58b0aab4c253b1e98d8958 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:40:18 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 8 -------- 4 files changed, 30 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6fced2f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: monotone -# $Id: Makefile,v 1.1 2005/07/18 23:50:55 roland Exp $ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/import.log b/import.log deleted file mode 100644 index 2ff9996..0000000 --- a/import.log +++ /dev/null @@ -1,8 +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_fc12:F-11:monotone-0.44-1.fc12.src.rpm:1242669791 -monotone-0_45-1_fc11:F-11:monotone-0.45-1.fc11.src.rpm:1252859489 -monotone-0_46-1_fc12:F-11:monotone-0.46-1.fc12.src.rpm:1264318810