From 30388ab69977332318dbbb404a2c4c0b3e26f17c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:52 +0000 Subject: [PATCH 1/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 81927fc62f2d1507d28a9ad0739f8a5b0410fefc Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 23 Jan 2010 22:16:02 +0000 Subject: [PATCH 2/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 1ee8393..cd3bb5a 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_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:F-12:monotone-0.46-1.fc12.src.rpm:1264284901 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 44c1e23a2d40506d93055ec633cf860429678021 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:00:17 +0000 Subject: [PATCH 3/6] Initialize branch EL-6 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..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 685f11c1d0ae1b9b945c8e0f093b8935ef096778 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 4 Jul 2010 22:07:34 +0000 Subject: [PATCH 4/6] Update to 0.48. --- .cvsignore | 2 +- import.log | 1 + monotone-0.46-netsync_large_file.patch | 36 -------------------------- monotone.spec | 20 +++++++++++--- sources | 2 +- 5 files changed, 19 insertions(+), 42 deletions(-) delete mode 100644 monotone-0.46-netsync_large_file.patch diff --git a/.cvsignore b/.cvsignore index c325f79..cb87ca6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -monotone-0.46.tar.gz +monotone-0.48.tar.gz diff --git a/import.log b/import.log index cd3bb5a..6b21d7a 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:F-12:monotone-0.46-1.fc12.src.rpm:1264284901 +monotone-0_48-1_fc13:EL-6:monotone-0.48-1.fc13.src.rpm:1278281205 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 aaf404b..4688ed1 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,5 +1,5 @@ Name: monotone -Version: 0.46 +Version: 0.48 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,14 +64,13 @@ and then pass commands to it. %prep %setup -q -%patch0 -p0 -b .netsync-large-file %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} @@ -190,6 +188,20 @@ 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. + +* 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. + * Sat Jan 23 2010 Thomas Moschny - 0.46-1 - Update to 0.46. - Remove patch applied upstream. diff --git a/sources b/sources index 5070437..f894a39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -405286223efcf375cd022dabf2f1c845 monotone-0.46.tar.gz +330a1fe1d92c899d1ad539606f85a9f8 monotone-0.48.tar.gz From 4d4b30651638d2eed6ba7ec795abd5815fbae2f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:40:15 +0000 Subject: [PATCH 5/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 9 --------- 4 files changed, 31 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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index 6b21d7a..0000000 --- a/import.log +++ /dev/null @@ -1,9 +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:F-12:monotone-0.46-1.fc12.src.rpm:1264284901 -monotone-0_48-1_fc13:EL-6:monotone-0.48-1.fc13.src.rpm:1278281205 From 0160a3cf3cbe79d8abe507e2941e022038bb1a05 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 9 Jan 2011 16:21:36 +0100 Subject: [PATCH 6/6] - Add patch for failing tests on ppc64. --- monotone-0.99.1-fix-pcrewrap.patch | 19 +++++++++++++++++++ monotone.spec | 9 ++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 monotone-0.99.1-fix-pcrewrap.patch diff --git a/monotone-0.99.1-fix-pcrewrap.patch b/monotone-0.99.1-fix-pcrewrap.patch new file mode 100644 index 0000000..599aa5e --- /dev/null +++ b/monotone-0.99.1-fix-pcrewrap.patch @@ -0,0 +1,19 @@ +# +# old_revision [6311a21b339135a6b9d4b98ef68e1e4e23183bb6] +# +# patch "pcrewrap.cc" +# from [096c37a8fcdbd0d4baf2434d16dea8663ecd1704] +# to [a4c2c48cb681e893d4bdda32bbebc0132479f8cd] +# +============================================================ +--- pcrewrap.cc 096c37a8fcdbd0d4baf2434d16dea8663ecd1704 ++++ pcrewrap.cc a4c2c48cb681e893d4bdda32bbebc0132479f8cd +@@ -144,7 +144,7 @@ namespace pcre + // because pcre_exec might not signal trailing unmatched subpatterns + // i.e. if "abc" matches "(abc)(de)?", the match count is two, not + // the expected three +- size_t cap_count = 0; ++ int cap_count = 0; + int rc = pcre_fullinfo(basedat, extradat, PCRE_INFO_CAPTURECOUNT, &cap_count); + I(rc == 0); + diff --git a/monotone.spec b/monotone.spec index 36e344e..dad154d 100644 --- a/monotone.spec +++ b/monotone.spec @@ -1,6 +1,6 @@ Name: monotone Version: 0.99.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A free, distributed version control system Group: Development/Tools License: GPLv2+ @@ -9,6 +9,8 @@ Source0: http://monotone.ca/downloads/%{version}/%{name}-%{version}.tar. Source1: monotone.init Source2: monotone.sysconfig Source3: README.monotone-server +# Fixes failing tests on ppc. +Patch0: monotone-0.99.1-fix-pcrewrap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel BuildRequires: boost-devel >= 1.33.1 @@ -63,6 +65,8 @@ and then pass commands to it. %prep %setup -q +%patch0 -p0 + %build %configure @@ -200,6 +204,9 @@ fi %changelog +* Sun Jan 9 2011 Thomas Moschny - 0.99.1-2 +- Add patch for failing tests on ppc64. + * Sun Oct 31 2010 Thomas Moschny - 0.99.1-1 - Update to 0.99.1. - Remove patch already applied upstream.