From 45cb9b33cc9248623fdd301f61d42b4307cc064e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 02:07:05 +0000 Subject: [PATCH 1/5] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 6b1acab340bf0b06967110ffbc60b19c920c8278 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 11 Apr 2010 13:40:11 +0000 Subject: [PATCH 2/5] Update to 0.47. --- .cvsignore | 2 +- import.log | 1 + monotone-0.46-netsync_large_file.patch | 36 -------------------------- monotone.spec | 10 ++++--- sources | 2 +- 5 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 monotone-0.46-netsync_large_file.patch diff --git a/.cvsignore b/.cvsignore index c325f79..0e1e13b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.46.tar.gz +monotone-0.47.tar.gz diff --git a/import.log b/import.log index 665e6ae..104bf6f 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ 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 +monotone-0_47-1_fc12:F-13:monotone-0.47-1.fc12.src.rpm:1270993166 diff --git a/monotone-0.46-netsync_large_file.patch b/monotone-0.46-netsync_large_file.patch deleted file mode 100644 index f9a9c88..0000000 --- a/monotone-0.46-netsync_large_file.patch +++ /dev/null @@ -1,36 +0,0 @@ -# -# -# 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 340bd69..aa2a689 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,5 +1,5 @@ Name: monotone -Version: 0.46 +Version: 0.47 Release: 1%{?dist} Summary: A free, distributed version control system @@ -11,7 +11,6 @@ Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz Source1: monotone.init Source2: monotone.sysconfig Source3: README.monotone-server -Patch0: monotone-0.46-netsync_large_file.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -65,7 +64,6 @@ and then pass commands to it. %prep %setup -q -%patch0 -p0 -b .netsync-large-file %build %configure @@ -190,9 +188,13 @@ fi %changelog +* Sun Apr 11 2010 Thomas Moschny - 0.47-1 +- Update to 0.47. +- Remove patch applied upstream. + * Sat Jan 23 2010 Thomas Moschny - 0.46-1 - Update to 0.46. -- Remove patch applied upstream +- 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. diff --git a/sources b/sources index 5070437..d12fa91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -405286223efcf375cd022dabf2f1c845 monotone-0.46.tar.gz +21da9c44a197f2e5e379a5bb4e42797e monotone-0.47.tar.gz From 8888b896c928d2c2976dc0f7a44895041adb7f76 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 8 May 2010 22:37:34 +0000 Subject: [PATCH 3/5] Add patch from upstream fixing a regression for netsync over pipes. --- import.log | 1 + monotone-0.47-netsync_over_pipe.patch | 14 ++++++++++++++ monotone.spec | 14 ++++++++++++-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 monotone-0.47-netsync_over_pipe.patch diff --git a/import.log b/import.log index 104bf6f..c70c3c6 100644 --- a/import.log +++ b/import.log @@ -7,3 +7,4 @@ 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 monotone-0_47-1_fc12:F-13:monotone-0.47-1.fc12.src.rpm:1270993166 +monotone-0_47-3_fc12:F-13:monotone-0.47-3.fc12.src.rpm:1273358217 diff --git a/monotone-0.47-netsync_over_pipe.patch b/monotone-0.47-netsync_over_pipe.patch new file mode 100644 index 0000000..ec098ce --- /dev/null +++ b/monotone-0.47-netsync_over_pipe.patch @@ -0,0 +1,14 @@ +--- network/reactor.cc a90cee5442d3c77d8082d7bb91d4d23170bf25fb ++++ network/reactor.cc 3c94489a6e1ce701dbdcac568cb30e5e9e764342 +@@ -87,9 +87,9 @@ void reactor::remove(shared_ptrremove_from_probe(probe); ++ have_pipe = false; + } + } + diff --git a/monotone.spec b/monotone.spec index aa2a689..4911d6c 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 0.47 -Release: 1%{?dist} +Release: 3%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -11,6 +11,8 @@ Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz Source1: monotone.init Source2: monotone.sysconfig Source3: README.monotone-server +# this is uppstream revision cb7a30cb.. +Patch0: monotone-0.47-netsync_over_pipe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -64,13 +66,14 @@ and then pass commands to it. %prep %setup -q +%patch0 -p0 %build %configure make %{?_smp_mflags} %check -make check %{?_smp_mflags} || { cat tester_dir/*.log; false; } +make %{?_smp_mflags} check || { cat tester_dir/*.log; false; } %install rm -rf %{buildroot} @@ -188,6 +191,13 @@ fi %changelog +* Sat May 8 2010 Thomas Moschny - 0.47-3 +- Add patch from upstream for a bug that prevents successful execution + of push / pull / sync over pipes. + +* Thu Apr 29 2010 Marcela Maslanova - 0.47-2 +- Mass rebuild with perl-5.12.0 + * Sun Apr 11 2010 Thomas Moschny - 0.47-1 - Update to 0.47. - Remove patch applied upstream. From 911145d8aef1f3f8838311bbaf9aa8412b5abcb4 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 3 Jul 2010 08:18:46 +0000 Subject: [PATCH 4/5] Update to 0.48. --- .cvsignore | 2 +- import.log | 1 + monotone-0.47-netsync_over_pipe.patch | 14 -------------- monotone.spec | 10 +++++----- sources | 2 +- 5 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 monotone-0.47-netsync_over_pipe.patch diff --git a/.cvsignore b/.cvsignore index 0e1e13b..cb87ca6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.47.tar.gz +monotone-0.48.tar.gz diff --git a/import.log b/import.log index c70c3c6..ebc2158 100644 --- a/import.log +++ b/import.log @@ -8,3 +8,4 @@ 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 monotone-0_47-1_fc12:F-13:monotone-0.47-1.fc12.src.rpm:1270993166 monotone-0_47-3_fc12:F-13:monotone-0.47-3.fc12.src.rpm:1273358217 +monotone-0_48-1_fc13:F-13:monotone-0.48-1.fc13.src.rpm:1278145081 diff --git a/monotone-0.47-netsync_over_pipe.patch b/monotone-0.47-netsync_over_pipe.patch deleted file mode 100644 index ec098ce..0000000 --- a/monotone-0.47-netsync_over_pipe.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- network/reactor.cc a90cee5442d3c77d8082d7bb91d4d23170bf25fb -+++ network/reactor.cc 3c94489a6e1ce701dbdcac568cb30e5e9e764342 -@@ -87,9 +87,9 @@ void reactor::remove(shared_ptrremove_from_probe(probe); -+ have_pipe = false; - } - } - diff --git a/monotone.spec b/monotone.spec index 4911d6c..4688ed1 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone -Version: 0.47 -Release: 3%{?dist} +Version: 0.48 +Release: 1%{?dist} Summary: A free, distributed version control system Group: Development/Tools @@ -11,8 +11,6 @@ Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar.gz Source1: monotone.init Source2: monotone.sysconfig Source3: README.monotone-server -# this is uppstream revision cb7a30cb.. -Patch0: monotone-0.47-netsync_over_pipe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,7 +64,6 @@ and then pass commands to it. %prep %setup -q -%patch0 -p0 %build %configure @@ -191,6 +188,9 @@ fi %changelog +* Mon Jun 14 2010 Thomas Moschny - 0.48-1 +- Update to 0.48. + * Sat May 8 2010 Thomas Moschny - 0.47-3 - Add patch from upstream for a bug that prevents successful execution of push / pull / sync over pipes. diff --git a/sources b/sources index d12fa91..f894a39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21da9c44a197f2e5e379a5bb4e42797e monotone-0.47.tar.gz +330a1fe1d92c899d1ad539606f85a9f8 monotone-0.48.tar.gz From 68c28c959a7d6a60fb1a91b93d0f9011287e0a8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:40:01 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 11 ----------- 4 files changed, 33 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index ebc2158..0000000 --- a/import.log +++ /dev/null @@ -1,11 +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_46-1_fc12:HEAD:monotone-0.46-1.fc12.src.rpm:1264284544 -monotone-0_47-1_fc12:F-13:monotone-0.47-1.fc12.src.rpm:1270993166 -monotone-0_47-3_fc12:F-13:monotone-0.47-3.fc12.src.rpm:1273358217 -monotone-0_48-1_fc13:F-13:monotone-0.48-1.fc13.src.rpm:1278145081