[monotone] Fix building against Boost 1.53 (FTBFS bug rhbz#914191).

[Thomas Moschny]

commit 8a72001ce848c0724cc28a3e5d2641cf5adf88c0
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Mar 10 18:41:20 2013 +0100

    Fix building against Boost 1.53 (FTBFS bug rhbz#914191).
    
    - Fix failing bash completion test.
    - Add patch to temporarily disable a failing check in one test (rhbz#919827).

 monotone-1.0-fix-bash_completion-test.patch |   24 ++++++++++++++++++++++++
 monotone-1.0-fix-diff_patch_drop-test.patch |   11 +++++++++++
 monotone.spec                               |   18 +++++++++++++++++-
 3 files changed, 52 insertions(+), 1 deletions(-)
---
diff --git a/monotone-1.0-fix-bash_completion-test.patch b/monotone-1.0-fix-bash_completion-test.patch
new file mode 100644
index 0000000..e6e74be
--- /dev/null
+++ b/monotone-1.0-fix-bash_completion-test.patch
@@ -0,0 +1,24 @@
+diff -up monotone-1.0/test/extra/bash_completion/bashrc.orig monotone-1.0/test/extra/bash_completion/bashrc
+--- monotone-1.0/test/extra/bash_completion/bashrc.orig	2011-03-26 07:41:02.000000000 +0100
++++ monotone-1.0/test/extra/bash_completion/bashrc	2013-03-09 18:44:36.811369952 +0100
+@@ -18,6 +18,8 @@ if [ "$BASH_COMPLETION" = "" ]; then
+ 	. /etc/bash_completion
+     elif [ -f /usr/local/etc/bash_completion ]; then
+ 	. /usr/local/etc/bash_completion
++    elif [ -f /usr/share/bash-completion/bash_completion ] ; then
++	. /usr/share/bash-completion/bash_completion
+     else
+ 	echo No bash completion package present.
+ 	exit
+diff -up monotone-1.0/test/extra/bash_completion/library.exp.orig monotone-1.0/test/extra/bash_completion/library.exp
+--- monotone-1.0/test/extra/bash_completion/library.exp.orig	2011-03-26 07:41:02.000000000 +0100
++++ monotone-1.0/test/extra/bash_completion/library.exp	2013-03-09 18:42:07.087240069 +0100
+@@ -16,7 +16,7 @@ set timeout 2
+ set env(initial_dir) $initial_dir
+ set env(srcdir) $srcdir
+ # some user's ~/.bash_profile start xserver etc; don't do that
+-spawn "bash" "--init-file" "/dev/nul" "--rcfile" "$srcdir/extra/bash_completion/bashrc"
++spawn "bash" "--init-file" "/dev/null" "--rcfile" "$srcdir/extra/bash_completion/bashrc"
+ # If there is no completion package, it's no point trying this.
+ # Make sure we do get a prompt.
+ expect {
diff --git a/monotone-1.0-fix-diff_patch_drop-test.patch b/monotone-1.0-fix-diff_patch_drop-test.patch
new file mode 100644
index 0000000..8940cde
--- /dev/null
+++ b/monotone-1.0-fix-diff_patch_drop-test.patch
@@ -0,0 +1,11 @@
+diff -up monotone-1.0/test/func/diff_patch_drop/__driver__.lua.orig monotone-1.0/test/func/diff_patch_drop/__driver__.lua
+--- monotone-1.0/test/func/diff_patch_drop/__driver__.lua.orig	2011-03-26 07:41:04.000000000 +0100
++++ monotone-1.0/test/func/diff_patch_drop/__driver__.lua	2013-03-10 16:17:05.508555733 +0100
+@@ -36,5 +36,6 @@ else
+     -- but it is a little aggressive and removes the dir too!
+     check({"patch", "-p0"}, 0, false, false, true)
+     check(not exists("dir/file"))
+-    check(not exists("dir"))
++    -- patch 2.7.1 does not remove the dir
++    -- check(not exists("dir"))
+ end
diff --git a/monotone.spec b/monotone.spec
index da1a587..e49562a 100644
--- a/monotone.spec
+++ b/monotone.spec
@@ -1,6 +1,6 @@
 Name:            monotone
 Version:         1.0
-Release:         10%{?dist}
+Release:         11%{?dist}
 Summary:         A free, distributed version control system
 Group:           Development/Tools
 License:         GPLv2+
@@ -19,6 +19,10 @@ Patch1:          monotone-1.0-fix-help.patch
 Patch2:          monotone-1.0-disable-xdelta-test.patch
 # Fix a failing test with pcre >= 8.21
 Patch3:          monotone-1.0-pcre.patch
+# Fix failing bash completion test
+Patch4:          monotone-1.0-fix-bash_completion-test.patch
+# See rhbz#919827
+Patch5:          monotone-1.0-fix-diff_patch_drop-test.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   zlib-devel
 BuildRequires:   boost-devel >= 1.33.1
@@ -30,6 +34,7 @@ BuildRequires:   libidn-devel
 # Required by the test suite:
 BuildRequires:   cvs
 BuildRequires:   bash-completion
+BuildRequires:   expect
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -78,6 +83,12 @@ and then pass commands to it.
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+# fix FTBFS rhbz#914191
+sed -e "s|shared_dynamic_cast|dynamic_pointer_cast|g" \
+  -i src/key_store.cc src/ssh_agent.cc src/database.cc
 
 
 %build
@@ -223,6 +234,11 @@ fi
 
 
 %changelog
+* Sat Mar  9 2013 Thomas Moschny <thomas.moschny at gmx.de> - 1.0-11
+- Fix building against Boost 1.53 (FTBFS bug rhbz#914191).
+- Fix failing bash completion test.
+- Add patch to temporarily disable a failing check in one test (rhbz#919827).
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild