Upstream update
This commit is contained in:
Denis Arnaud
parent
ff7fcdbdec
commit
a211ca5b97
|
|
@ -1,38 +0,0 @@
|
|||
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
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
c3cd885e29cdc9d46eb287439a62178b travelccm-1.00.2.tar.bz2
|
||||
SHA512 (travelccm-1.00.3.tar.gz) = 3f22152da3b89b4e619a2b641ac9b32304f5466e124e5e84d1748bd065c74722534a184bbdd8628e316171802d6f8905af77786bd91c829f1d2d94db1afb9b1c
|
||||
|
|
|
|||
|
|
@ -3,21 +3,22 @@
|
|||
#
|
||||
Name: travelccm
|
||||
%global sfname travel-ccm
|
||||
Version: 1.00.2
|
||||
Release: 16%{?dist}
|
||||
Version: 1.00.3
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: C++ Travel Customer Choice Model (CCM) Library
|
||||
|
||||
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
|
||||
URL: http://github.com/airsim/%{name}
|
||||
Source0: %{url}/archive/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake, python-devel
|
||||
BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel
|
||||
BuildRequires: boost-python2-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: boost-python3-devel
|
||||
BuildRequires: soci-mysql-devel
|
||||
BuildRequires: soci-sqlite3-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: stdair-devel
|
||||
|
||||
|
|
@ -53,7 +54,6 @@ for Customer-Choice Modeling (CCM), mainly for simulation purpose.
|
|||
|
||||
%package devel
|
||||
Summary: Header files, libraries and development helper tools for %{name}
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
|
|
@ -64,10 +64,7 @@ programs using %{name}, you will need to install %{name}-devel.
|
|||
|
||||
%package doc
|
||||
Summary: HTML documentation for the %{name} library
|
||||
Group: Documentation
|
||||
%if 0%{?fedora} || 0%{?rhel} > 5
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
BuildRequires: tex(latex)
|
||||
BuildRequires: doxygen, ghostscript
|
||||
|
||||
|
|
@ -79,17 +76,15 @@ online (http://%{name}.org).
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%autosetup -n %{name}-%{name}-%{version}
|
||||
|
||||
|
||||
%build
|
||||
%cmake .
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%make_install
|
||||
|
||||
mkdir -p %{mydocs}
|
||||
mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html %{mydocs}
|
||||
|
|
@ -97,18 +92,14 @@ rm -f %{mydocs}/html/installdox
|
|||
|
||||
# Remove additional documentation files (those files are already available
|
||||
# in the project top directory)
|
||||
rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README,AUTHORS}
|
||||
rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README.md,AUTHORS}
|
||||
|
||||
%check
|
||||
ctest
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README.md
|
||||
%{_bindir}/%{name}
|
||||
%{_libdir}/lib%{name}.so.*
|
||||
%{_mandir}/man1/%{name}.1.*
|
||||
|
|
@ -130,6 +121,9 @@ ctest
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Jan 17 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.3-1
|
||||
- Upstream update
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.2-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue