From af0193d59412a74a402d3f522ad7aec4594882c4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Aug 30 2015 01:07:12 +0000 Subject: Patched and rebuilt for Boost 1.59 --- 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..7ff671c --- /dev/null +++ b/0001-Fix-for-Boost-1.59.0-compatibility.patch @@ -0,0 +1,38 @@ +From b86f7d78e401271f5bd0b60ab4403a1db8b57f35 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Sun, 30 Aug 2015 02:05: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/airinv/InventoryTestSuite.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/test/airinv/InventoryTestSuite.cpp b/test/airinv/InventoryTestSuite.cpp +index bdd3083..9930aee 100644 +--- a/test/airinv/InventoryTestSuite.cpp ++++ b/test/airinv/InventoryTestSuite.cpp +@@ -14,6 +14,7 @@ + #define BOOST_TEST_MAIN + #define BOOST_TEST_MODULE InventoryTestSuite + #include ++#include + // StdAir + #include + #include +@@ -39,7 +40,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/airinv.spec b/airinv.spec index 4698956..2a7778d 100644 --- a/airinv.spec +++ b/airinv.spec @@ -3,7 +3,7 @@ # Name: airinv Version: 1.00.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ Simulated Airline Inventory Management 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 @@ -66,6 +67,7 @@ online (http://%{name}.org). %prep %setup -q +%patch0 -p1 %build @@ -127,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 30 2015 Jonathan Wakely 1.00.1-7 +- Patched and rebuilt for Boost 1.59 + * Sat Aug 29 2015 Denis Arnaud - 1.00.1-6 - Mass rebuild