[monotone/f16] fix FTBFS due a symbol conflict with boost

[Dan Horák]

commit 70a224e841867905823885788b2d96dff49ac5fc
Author: Dan Horák <dan at danny.cz>
Date:   Mon Sep 26 18:15:04 2011 +0200

    fix FTBFS due a symbol conflict with boost

 monotone-1.0-disable-xdelta-test.patch |   41 ++++++++++++++++++++++++++++++++
 monotone.spec                          |    9 ++++++-
 2 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/monotone-1.0-disable-xdelta-test.patch b/monotone-1.0-disable-xdelta-test.patch
new file mode 100644
index 0000000..e4b3b64
--- /dev/null
+++ b/monotone-1.0-disable-xdelta-test.patch
@@ -0,0 +1,41 @@
+diff -up monotone-1.0/Makefile.am.orig monotone-1.0/Makefile.am
+--- monotone-1.0/Makefile.am.orig	2011-09-26 17:57:52.000000000 +0200
++++ monotone-1.0/Makefile.am	2011-09-26 17:58:13.000000000 +0200
+@@ -191,7 +191,7 @@ UNIT_TESTERS =									\
+ 	test/unit/tests/restrictions.cc test/unit/tests/revision.cc		\
+ 	test/unit/tests/simplestring_xform.cc test/unit/tests/transforms.cc	\
+ 	test/unit/tests/uri.cc test/unit/tests/vocab.cc				\
+-	test/unit/tests/xdelta.cc test/unit/tests/numeric_vocab.cc		\
++	test/unit/tests/numeric_vocab.cc		\
+ 	test/unit/tests/sha1.cc test/unit/tests/string_queue.cc			\
+ 	test/unit/unit_tester.cc
+ 
+diff -up monotone-1.0/Makefile.in.orig monotone-1.0/Makefile.in
+--- monotone-1.0/Makefile.in.orig	2011-09-26 17:57:58.000000000 +0200
++++ monotone-1.0/Makefile.in	2011-09-26 17:59:19.000000000 +0200
+@@ -422,7 +422,6 @@ am__objects_19 = test/unit/tests/basic_i
+ 	test/unit/tests/simplestring_xform.$(OBJEXT) \
+ 	test/unit/tests/transforms.$(OBJEXT) \
+ 	test/unit/tests/uri.$(OBJEXT) test/unit/tests/vocab.$(OBJEXT) \
+-	test/unit/tests/xdelta.$(OBJEXT) \
+ 	test/unit/tests/numeric_vocab.$(OBJEXT) \
+ 	test/unit/tests/sha1.$(OBJEXT) \
+ 	test/unit/tests/string_queue.$(OBJEXT) \
+@@ -887,7 +886,7 @@ UNIT_TESTERS = \
+ 	test/unit/tests/restrictions.cc test/unit/tests/revision.cc		\
+ 	test/unit/tests/simplestring_xform.cc test/unit/tests/transforms.cc	\
+ 	test/unit/tests/uri.cc test/unit/tests/vocab.cc				\
+-	test/unit/tests/xdelta.cc test/unit/tests/numeric_vocab.cc		\
++	test/unit/tests/numeric_vocab.cc		\
+ 	test/unit/tests/sha1.cc test/unit/tests/string_queue.cc			\
+ 	test/unit/unit_tester.cc
+ 
+@@ -1774,8 +1773,6 @@ test/unit/tests/uri.$(OBJEXT): test/unit
+ 	test/unit/tests/$(DEPDIR)/$(am__dirstamp)
+ test/unit/tests/vocab.$(OBJEXT): test/unit/tests/$(am__dirstamp) \
+ 	test/unit/tests/$(DEPDIR)/$(am__dirstamp)
+-test/unit/tests/xdelta.$(OBJEXT): test/unit/tests/$(am__dirstamp) \
+-	test/unit/tests/$(DEPDIR)/$(am__dirstamp)
+ test/unit/tests/numeric_vocab.$(OBJEXT):  \
+ 	test/unit/tests/$(am__dirstamp) \
+ 	test/unit/tests/$(DEPDIR)/$(am__dirstamp)
diff --git a/monotone.spec b/monotone.spec
index fea9d47..c9068eb 100644
--- a/monotone.spec
+++ b/monotone.spec
@@ -1,6 +1,6 @@
 Name:            monotone
 Version:         1.0
-Release:         3%{?dist}
+Release:         4%{?dist}
 Summary:         A free, distributed version control system
 Group:           Development/Tools
 License:         GPLv2+
@@ -14,6 +14,9 @@ Source4:         monotone-server-tmpfiles.conf
 Patch0:          monotone-1.0-file_handle.patch
 # rev a570769b from upstream
 Patch1:          monotone-1.0-fix-help.patch
+# FTBFS (symbol conflict with boost)
+# https://code.monotone.ca/p/monotone/issues/191/
+Patch2:          monotone-1.0-disable-xdelta-test.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   zlib-devel
 BuildRequires:   boost-devel >= 1.33.1
@@ -71,6 +74,7 @@ and then pass commands to it.
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
 
 
 %build
@@ -216,6 +220,9 @@ fi
 
 
 %changelog
+* Mon Sep 26 2011 Dan Horák <dan[at]danny.cz> - 1.0-4
+- fix FTBFS due a symbol conflict with boost
+
 * Mon Jun 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1.0-3
 - Perl mass rebuild