[xylib] Fix building with Boost.Spirit v2

[Petr Machata]

commit 7ba1cca88625018fc00647126e91327bc6f347ab
Author: Petr Machata <pmachata at redhat.com>
Date:   Fri Feb 8 02:16:45 2013 +0100

    Fix building with Boost.Spirit v2

 xylib-0.8-spirit.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 xylib.spec             |    7 ++++++-
 2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/xylib-0.8-spirit.patch b/xylib-0.8-spirit.patch
new file mode 100644
index 0000000..e6bae28
--- /dev/null
+++ b/xylib-0.8-spirit.patch
@@ -0,0 +1,42 @@
+diff -up xylib-0.8/xylib/pdcif.cpp\~ xylib-0.8/xylib/pdcif.cpp
+--- xylib-0.8/xylib/pdcif.cpp~	2011-01-18 15:48:15.000000000 +0100
++++ xylib-0.8/xylib/pdcif.cpp	2013-02-08 00:10:40.000000000 +0100
+@@ -8,9 +8,9 @@
+ #include <map>
+ 
+ //#define BOOST_SPIRIT_DEBUG
+-#include <boost/spirit/core.hpp>
+-#include <boost/spirit/utility/chset.hpp>
+-#include <boost/spirit/actor/increment_actor.hpp>
++#include <boost/spirit/include/classic_core.hpp>
++#include <boost/spirit/home/classic/utility/chset.hpp>
++#include <boost/spirit/home/classic/actor/increment_actor.hpp>
+ 
+ #include "util.h"
+ 
+@@ -20,7 +19,7 @@
+ #endif
+ 
+ using namespace std;
+-using namespace boost::spirit;
++using namespace boost::spirit::classic;
+ using namespace xylib::util;
+ 
+ namespace xylib {
+diff -up xylib-0.8/configure\~ xylib-0.8/configure
+--- xylib-0.8/configure~	2011-01-18 15:48:26.000000000 +0100
++++ xylib-0.8/configure	2013-02-08 00:09:20.000000000 +0100
+@@ -14945,9 +14945,9 @@ fi
+ 
+ done
+ 
+-for ac_header in boost/spirit/core.hpp
++for ac_header in boost/spirit/include/classic_core.hpp
+ do :
+-  ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/core.hpp" "ac_cv_header_boost_spirit_core_hpp" "$ac_includes_default"
++  ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/include/classic_core.hpp" "ac_cv_header_boost_spirit_core_hpp" "$ac_includes_default"
+ if test "x$ac_cv_header_boost_spirit_core_hpp" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_BOOST_SPIRIT_CORE_HPP 1
+
+Diff finished.  Fri Feb  8 00:11:03 2013
diff --git a/xylib.spec b/xylib.spec
index d69bc59..061e75e 100644
--- a/xylib.spec
+++ b/xylib.spec
@@ -1,11 +1,12 @@
 Name: xylib
 Summary: Library for reading x-y data from several file formats
 Version: 0.8
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2
 Group: Development/Libraries
 Url: http://xylib.sourceforge.net/
 Source0: http://downloads.sourceforge.net/xylib/%{name}-%{version}.tar.bz2
+Patch0: xylib-0.8-spirit.patch
 BuildRequires: gcc-c++, boost-devel, zlib-devel, bzip2-devel
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -28,6 +29,7 @@ powder diffraction, spectroscopy or other experimental methods.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -58,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libxy.so
 
 %changelog
+* Fri Feb  8 2013 Petr Machata <pmachata at redhat.com> - 0.8-5
+- Add a patch for compilation with Boost.Spirit V2
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild