Patched and rebuilt for Boost 1.59

This commit is contained in:
Jonathan Wakely 2015-08-30 01:12:03 +01:00
parent e322cfd30f
commit eb4ec8ea56
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,38 @@
From 5ccc0ef7f07a0345370e25df4cf553023eb23148 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Sun, 30 Aug 2015 01:11:03 +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/travelccm/TravelChoiceTestSuite.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/test/travelccm/TravelChoiceTestSuite.cpp b/test/travelccm/TravelChoiceTestSuite.cpp
index 14dfd44..cf6841e 100644
--- a/test/travelccm/TravelChoiceTestSuite.cpp
+++ b/test/travelccm/TravelChoiceTestSuite.cpp
@@ -14,6 +14,7 @@
#define BOOST_TEST_MAIN
#define BOOST_TEST_MODULE TravelCCMTest
#include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
// StdAir
#include <stdair/basic/BasLogParams.hpp>
#include <stdair/basic/BasDBParams.hpp>
@@ -38,7 +39,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

View File

@ -4,7 +4,7 @@
Name: travelccm
%global sfname travel-ccm
Version: 1.00.2
Release: 4%{?dist}
Release: 5%{?dist}
Summary: C++ Travel Customer Choice Model (CCM) Library
@ -12,6 +12,7 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://sourceforge.net/projects/%{sfname}/
Source0: http://downloads.sourceforge.net/%{sfname}/%{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
@ -78,6 +79,7 @@ online (http://%{name}.org).
%prep
%setup -q
%patch0 -p1
%build
@ -133,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Aug 30 2015 Jonathan Wakely <jwakely@redhat.com> 1.00.2-5
- Patched and rebuilt for Boost 1.59
* Sat Aug 29 2015 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.2-4
- Mass rebuild