Upstream update
This commit is contained in:
Denis Arnaud
parent
b906161b68
commit
82842f0ad3
|
|
@ -1,38 +0,0 @@
|
|||
From dfb3407046ce37c1f4516d615c65eca94b680048 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Wakely <jwakely@redhat.com>
|
||||
Date: Sun, 30 Aug 2015 01:04:37 +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/airrac/YieldTestSuite.cpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/test/airrac/YieldTestSuite.cpp b/test/airrac/YieldTestSuite.cpp
|
||||
index a0151e5..d08d35a 100644
|
||||
--- a/test/airrac/YieldTestSuite.cpp
|
||||
+++ b/test/airrac/YieldTestSuite.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
#define BOOST_TEST_MAIN
|
||||
#define BOOST_TEST_MODULE YieldTestSuite
|
||||
#include <boost/test/unit_test.hpp>
|
||||
+#include <boost/version.hpp>
|
||||
// StdAir
|
||||
#include <stdair/basic/BasLogParams.hpp>
|
||||
#include <stdair/basic/BasDBParams.hpp>
|
||||
@@ -36,7 +37,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
|
||||
|
||||
21
airrac.spec
21
airrac.spec
|
|
@ -2,21 +2,20 @@
|
|||
%global mydocs __tmp_docdir
|
||||
#
|
||||
Name: airrac
|
||||
Version: 1.00.1
|
||||
Release: 17%{?dist}
|
||||
Version: 1.00.2
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: C++ Simulated Revenue Accounting (RAC) System Library
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv2+
|
||||
URL: http://sourceforge.net/projects/%{name}/
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
||||
Patch0: 0001-Fix-for-Boost-1.59.0-compatibility.patch
|
||||
URL: http://github.com/airsim/%{name}
|
||||
Source0: https://github.com/airsim/%{name}/archive/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake, python-devel
|
||||
BuildRequires: cmake, python3-devel
|
||||
BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel
|
||||
BuildRequires: boost-python2-devel
|
||||
BuildRequires: boost-python3-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: stdair-devel
|
||||
|
||||
|
|
@ -60,8 +59,7 @@ online (http://%{name}.org).
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%autosetup -n %{name}-%{name}-%{version}
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -89,7 +87,7 @@ ctest
|
|||
|
||||
|
||||
%files
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README.md
|
||||
%{_bindir}/%{name}
|
||||
%{_libdir}/lib%{name}.so.*
|
||||
%{_mandir}/man1/%{name}.1.*
|
||||
|
|
@ -111,6 +109,9 @@ ctest
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 15 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.2-1
|
||||
- Upstream update
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.1-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue