Upstream update
This commit is contained in:
Denis Arnaud
parent
aa709e4a3a
commit
3353754f50
|
|
@ -1,113 +0,0 @@
|
|||
From e68f53c48b72a9ed86d35bb9b3c5d64e1b228b90 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Wakely <jwakely@redhat.com>
|
||||
Date: Sun, 30 Aug 2015 01:55:09 +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/rmol/ForecasterTestSuite.cpp | 5 +++++
|
||||
test/rmol/OptimiseTestSuite.cpp | 5 +++++
|
||||
test/rmol/UnconstrainerTestSuite.cpp | 5 +++++
|
||||
test/rmol/bomsforforecaster.cpp | 5 +++++
|
||||
4 files changed, 20 insertions(+)
|
||||
|
||||
diff --git a/test/rmol/ForecasterTestSuite.cpp b/test/rmol/ForecasterTestSuite.cpp
|
||||
index 665571e..6d8cdf7 100644
|
||||
--- a/test/rmol/ForecasterTestSuite.cpp
|
||||
+++ b/test/rmol/ForecasterTestSuite.cpp
|
||||
@@ -16,6 +16,7 @@
|
||||
#define BOOST_TEST_MAIN
|
||||
#define BOOST_TEST_MODULE ForecasterTestSuite
|
||||
#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);
|
||||
}
|
||||
diff --git a/test/rmol/OptimiseTestSuite.cpp b/test/rmol/OptimiseTestSuite.cpp
|
||||
index 3919f7a..b9851c2 100644
|
||||
--- a/test/rmol/OptimiseTestSuite.cpp
|
||||
+++ b/test/rmol/OptimiseTestSuite.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
#define BOOST_TEST_MAIN
|
||||
#define BOOST_TEST_MODULE OptimiseTestSuite
|
||||
#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);
|
||||
}
|
||||
diff --git a/test/rmol/UnconstrainerTestSuite.cpp b/test/rmol/UnconstrainerTestSuite.cpp
|
||||
index 846cbfc..a9cc4a9 100644
|
||||
--- a/test/rmol/UnconstrainerTestSuite.cpp
|
||||
+++ b/test/rmol/UnconstrainerTestSuite.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
#define BOOST_TEST_MAIN
|
||||
#define BOOST_TEST_MODULE UnconstrainerTestSuite
|
||||
#include <boost/test/unit_test.hpp>
|
||||
+#include <boost/version.hpp>
|
||||
// StdAir
|
||||
#include <stdair/basic/BasLogParams.hpp>
|
||||
#include <stdair/basic/BasDBParams.hpp>
|
||||
@@ -34,7 +35,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);
|
||||
}
|
||||
diff --git a/test/rmol/bomsforforecaster.cpp b/test/rmol/bomsforforecaster.cpp
|
||||
index 48b34a9..b900412 100644
|
||||
--- a/test/rmol/bomsforforecaster.cpp
|
||||
+++ b/test/rmol/bomsforforecaster.cpp
|
||||
@@ -16,6 +16,7 @@
|
||||
#define BOOST_TEST_MAIN
|
||||
#define BOOST_TEST_MODULE OptimiseTestSuite
|
||||
#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
|
||||
|
||||
89
rmol.spec
89
rmol.spec
|
|
@ -1,24 +1,37 @@
|
|||
#
|
||||
%global mydocs __tmp_docdir
|
||||
|
||||
# Build -python subpackage
|
||||
%bcond_without python
|
||||
|
||||
# See also http://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Private_Libraries
|
||||
%if %{with python}
|
||||
%global _privatelibs libpy%{name}[.]so.*
|
||||
%global __provides_exclude ^(%{_privatelibs})$
|
||||
%global __requires_exclude ^(%{_privatelibs})$
|
||||
%endif
|
||||
|
||||
#
|
||||
Name: rmol
|
||||
Version: 1.00.1
|
||||
Release: 18%{?dist}
|
||||
Version: 1.00.2
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: C++ library of Revenue Management and Optimisation classes and functions
|
||||
|
||||
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
|
||||
URL: https://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: readline-devel
|
||||
BuildRequires: stdair-devel, airrac-devel
|
||||
BuildRequires: soci-mysql-devel
|
||||
BuildRequires: soci-sqlite3-devel
|
||||
BuildRequires: stdair-devel
|
||||
BuildRequires: airrac-devel
|
||||
|
||||
|
||||
%description
|
||||
|
|
@ -42,7 +55,6 @@ for Airline Revenue Management (RM), 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
|
||||
|
||||
|
|
@ -53,23 +65,32 @@ 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
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: ghostscript
|
||||
|
||||
%description doc
|
||||
This package contains HTML pages, as well as a PDF reference manual,
|
||||
for %{name}. All that documentation is generated thanks to Doxygen
|
||||
(http://doxygen.org). The content is the same as what can be browsed
|
||||
online (http://%{name}.org).
|
||||
online (http://%{name}.net).
|
||||
|
||||
%if %{with python}
|
||||
%package -n python3-%{name}
|
||||
Summary: Python bindings for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
%{?python_provide:%python_provide python3-%{name}}
|
||||
|
||||
%description -n python3-%{name}
|
||||
This package contains Python libraries for %{name}
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%autosetup -n %{name}-%{name}-%{version}
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -77,33 +98,34 @@ online (http://%{name}.org).
|
|||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
mkdir -p %{mydocs}
|
||||
mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html %{mydocs}
|
||||
mv %{buildroot}%{_docdir}/%{name}/html %{mydocs}
|
||||
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 %{buildroot}%{_docdir}/%{name}/{NEWS,README,AUTHORS}
|
||||
|
||||
%if %{with python}
|
||||
# (Pure) Python RMOL executable
|
||||
install -d %{buildroot}%{python3_sitearch}/py%{name}
|
||||
#install -pm 0755 %%{buildroot}%%{_bindir}/py%%{name} %%{buildroot}%%{python3_sitearch}/py%%{name}/
|
||||
install -pm 0755 %{buildroot}%{_bindir}/%{name}_drawBPC %{buildroot}%{python3_sitearch}/py%{name}/
|
||||
rm -f %{buildroot}%{_bindir}/%{name}_drawBPC # %%{buildroot}%%{_bindir}/py%%{name}
|
||||
%endif
|
||||
|
||||
%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}
|
||||
%{_bindir}/%{name}_drawBPC
|
||||
%{_bindir}/%{name}_extractBPC
|
||||
%{_libdir}/lib%{name}.so.*
|
||||
%{_mandir}/man1/%{name}.1.*
|
||||
%{_mandir}/man1/%{name}_drawBPC.1.*
|
||||
%{_mandir}/man1/%{name}_extractBPC.1.*
|
||||
|
||||
%files devel
|
||||
|
|
@ -121,8 +143,17 @@ ctest
|
|||
%doc %{mydocs}/html
|
||||
%doc COPYING
|
||||
|
||||
%if %{with python}
|
||||
%files -n python3-%{name}
|
||||
%{python3_sitearch}/py%{name}/
|
||||
#%%{_mandir}/man1/py%%{name}.1.*
|
||||
%{_mandir}/man1/%{name}_drawBPC.1.*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jan 16 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.2-1
|
||||
- Upstream update
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.1-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue