diff --git a/0001-Fix-for-Boost-1.59.0-compatibility.patch b/0001-Fix-for-Boost-1.59.0-compatibility.patch new file mode 100644 index 0000000..8af99ec --- /dev/null +++ b/0001-Fix-for-Boost-1.59.0-compatibility.patch @@ -0,0 +1,38 @@ +From af90161a2e0280fcf4eb74fee259f90016869b22 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Sun, 30 Aug 2015 02:20:15 +0100 +Subject: [PATCH] Fix for Boost 1.59.0 compatibility. + +Boost.Test has major changes in 1.59.0 including renaming the +XML enumerator to OF_XML. +--- + test/simcrs/CRSTestSuite.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/test/simcrs/CRSTestSuite.cpp b/test/simcrs/CRSTestSuite.cpp +index 3c80468..2b7f2f2 100644 +--- a/test/simcrs/CRSTestSuite.cpp ++++ b/test/simcrs/CRSTestSuite.cpp +@@ -15,6 +15,7 @@ + #define BOOST_TEST_MAIN + #define BOOST_TEST_MODULE CRSTestSuite + #include ++#include + // StdAir + #include + #include +@@ -40,7 +41,11 @@ struct UnitTestConfig { + /** Constructor. */ + UnitTestConfig() { + boost_utf::unit_test_log.set_stream (utfReportStream); ++#if BOOST_VERSION >= 105900 ++ boost_utf::unit_test_log.set_format (boost_utf::OF_XML); ++#else + boost_utf::unit_test_log.set_format (boost_utf::XML); ++#endif + boost_utf::unit_test_log.set_threshold_level (boost_utf::log_test_units); + //boost_utf::unit_test_log.set_threshold_level (boost_utf::log_successful_tests); + } +-- +2.4.3 + diff --git a/simcrs.spec b/simcrs.spec index 828c92d..2de4f03 100644 --- a/simcrs.spec +++ b/simcrs.spec @@ -3,7 +3,7 @@ # Name: simcrs Version: 1.01.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ Simulated Travel-Oriented Distribution System library @@ -11,6 +11,7 @@ Group: System Environment/Libraries License: LGPLv2+ URL: http://%{name}.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Patch0: 0001-Fix-for-Boost-1.59.0-compatibility.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: cmake, python-devel @@ -68,6 +69,7 @@ online (http://%{name}.org). %prep %setup -q +%patch0 -p1 %build @@ -123,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 30 2015 Jonathan Wakely - 1.01.1-6 +- Patched and rebuilt for Boost 1.59 + * Sat Aug 29 2015 Denis Arnaud - 1.01.1-5 - Mass rebuild