[stdair/el5] Added a patch to fix a Boost.UTF-related test on EPEL 5.

Denis Arnaud denisarnaud at fedoraproject.org
Sun Dec 18 00:52:14 UTC 2011


commit e66e67d3116fec10e84217b5fff66368b3a53671
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Sun Dec 18 01:52:10 2011 +0100

    Added a patch to fix a Boost.UTF-related test on EPEL 5.

 stdair-fix-boost-test-build.patch |   19 +++++++++++++++++++
 stdair.spec                       |    5 ++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/stdair-fix-boost-test-build.patch b/stdair-fix-boost-test-build.patch
new file mode 100644
index 0000000..1e4a62b
--- /dev/null
+++ b/stdair-fix-boost-test-build.patch
@@ -0,0 +1,19 @@
+diff --git a/test/stdair/StandardAirlineITTestSuite.cpp b/test/stdair/StandardAirlineITTestSuite.cpp
+index 8889740..65ab573 100644
+--- a/test/stdair/StandardAirlineITTestSuite.cpp
++++ b/test/stdair/StandardAirlineITTestSuite.cpp
+@@ -122,12 +122,12 @@ BOOST_AUTO_TEST_CASE (mpl_structure_test) {
+   
+   if (boost::is_same<stdair_test::BookingClass,
+                      stdair_test::Cabin::child>::value == false) {
+-    BOOST_REQUIRE ("The two types mut be equal, but are not");
++    BOOST_ERROR ("The two types mut be equal, but are not");
+   }
+   
+   if (boost::is_same<boost::mpl::at_c<types, 1>::type,
+                      stdair_test::Cabin>::value == false) {
+-    BOOST_REQUIRE ("The type must be stdair_test::Cabin, but is not");
++    BOOST_ERROR ("The type must be stdair_test::Cabin, but is not");
+   }
+ }
+ 
diff --git a/stdair.spec b/stdair.spec
index dd8ab5f..57156ee 100644
--- a/stdair.spec
+++ b/stdair.spec
@@ -16,6 +16,9 @@ BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  cmake, python26-devel
 BuildRequires:  boost141-devel, soci-mysql-devel, zeromq-devel, readline-devel
 
+# The following patch comes from upstream: it is therefore already fixed in next version:
+# https://github.com/airsim/stdair/commit/c33edce960715d13f9c1208882fa2cba0aa38fa3
+Patch0:         stdair-fix-boost-test-build.patch
 
 %description
 %{name} aims at providing a clean API, and the corresponding C++
@@ -58,7 +61,7 @@ online (http://%{name}.org).
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 mkdir -p build


More information about the scm-commits mailing list