complete boost 1.58 build fix, and adjust for %doc changes

a1cb25ad2d9a98ea9ec0bb3ee27fe3cde6046434.patch

@@ -0,0 +1,36 @@
+From a1cb25ad2d9a98ea9ec0bb3ee27fe3cde6046434 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Johann=20Kl=C3=A4hn?= <kljohann@gmail.com>
+Date: Sun, 10 May 2015 13:41:26 +0200
+Subject: [PATCH] fix build for boost 1.58
+
+---
+ src/filters.cc   | 2 +-
+ src/iterators.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/filters.cc b/src/filters.cc
+index 2f97a0e..b6530c0 100644
+--- a/src/filters.cc
++++ b/src/filters.cc
+@@ -707,7 +707,7 @@ namespace {
+     insert_prices_in_map(price_map_t& _all_prices)
+       : all_prices(_all_prices) {}
+ 
+-    void operator()(datetime_t& date, const amount_t& price) {
++    void operator()(const datetime_t& date, const amount_t& price) {
+       all_prices.insert(price_map_t::value_type(date, price));
+     }
+   };
+diff --git a/src/iterators.cc b/src/iterators.cc
+index 21bec5d..0225e21 100644
+--- a/src/iterators.cc
++++ b/src/iterators.cc
+@@ -96,7 +96,7 @@ namespace {
+       TRACE_DTOR(create_price_xact);
+     }
+ 
+-    void operator()(datetime_t& date, const amount_t& price) {
++    void operator()(const datetime_t& date, const amount_t& price) {
+       xact_t * xact;
+       string   symbol = price.commodity().symbol();
+ 

ledger.spec

@@ -22,8 +22,9 @@ Patch6:           %{name}-3.1-0006-Fix-numbers-from-example.patch
 Patch7:           %{name}-3.1-0007-Update-ledger3.texi.patch
 Patch8:           %{name}-3.1-0008-Update-ledger3.texi.patch
 Patch9:           %{name}-3.1-0009-Some-minor-changes.patch
-# Fixes build with Boost 1.58.
-Patch10:          https://github.com/ledger/ledger/pull/422.patch
+# Together, these backports fix build with Boost 1.58
+Patch10:          https://github.com/ledger/ledger/commit/bcaca24de4264f89a94069701361988007e22e58.patch
+Patch11:          https://github.com/ledger/ledger/commit/a1cb25ad2d9a98ea9ec0bb3ee27fe3cde6046434.patch
 
 BuildRequires:    boost-devel
 BuildRequires:    cmake
@@ -100,6 +101,7 @@ emacs-%{name} instead.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 
 %build
@@ -128,7 +130,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
 install -p -m0644 contrib/ledger-completion.bash \
     %{buildroot}%{_sysconfdir}/bash_completion.d/ledger
 
-# Install documentation manually
+# Install documentation manually to a convenient directory layout
 rm -rf %{buildroot}%{_docdir}
 rm -rf %{buildroot}%{_infodir}/*
 
@@ -175,6 +177,11 @@ fi
 %doc doc/GLOSSARY.md doc/LICENSE doc/NEWS
 %doc doc/ledger3.html doc/ledger-mode.html
 %doc doc/ledger3.pdf  doc/ledger-mode.pdf
+# https://bugzilla.redhat.com/show_bug.cgi?id=728959
+# These must be explicitly listed.
+%doc %{_pkgdocdir}/contrib
+%doc %{_pkgdocdir}/python
+%doc %{_pkgdocdir}/samples
 %{_bindir}/ledger
 %{_infodir}/ledger3.info*
 %{_infodir}/ledger-mode.info*
@@ -200,7 +207,8 @@ fi
 
 %changelog
 * Mon Jul 27 2015 Adam Williamson <awilliam@redhat.com> - 3.1-7
-- add patch from jwakely to fix build with Boost 1.58
+- add patches from jwakely to fix build with Boost 1.58
+- fix pkgdocdir usage
 
 * Wed Jul 22 2015 David Tardon <dtardon@redhat.com>
 - rebuild for Boost 1.58