Compare commits
25 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
6a05d52629 | ||
|
6b81b45bfe | ||
|
2ded6fc33c | ||
|
917094fe8f | ||
|
0e756e4e40 | ||
|
bf92ee51cc | ||
|
0f71d2d7b9 | ||
|
2f6da13086 | ||
|
5fece3e1d6 | ||
|
fc33755c9d | ||
|
52cae5689b | ||
|
bf64e083ee | ||
|
dcc6f04ab4 | ||
|
f61ad7611f | ||
|
0cdf6352a6 | ||
|
6c442e9ec5 | ||
|
71fa89154f | ||
|
b78b4a5fb2 | ||
|
b21ffc7000 | ||
|
c31b80f01c | ||
|
24ba6f186a | ||
|
6ee6fde3f6 | ||
|
f876387c91 | ||
|
83d6d3de6f | ||
|
bd75efb031 |
2
sources
2
sources
@ -1 +1 @@
|
||||
805c0e9614e25e455ae2fa081da6e0f9 stdair-1.00.2.tar.bz2
|
||||
SHA512 (stdair-1.00.8.tar.gz) = 216aa0d0c4a0f5ce19b3456051593313c7e913e7a704eb15fa178390e48fc5fdc6631149a4beb04cba379f2ba628d6bde85007d686242d00a7f77b958ac4168b
|
||||
|
@ -1,26 +0,0 @@
|
||||
From 0462594a6b3c23b96ec3a90d58f7c9db3f721162 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Wakely <github@kayari.org>
|
||||
Date: Sat, 29 Aug 2015 13:38:07 +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/stdair/StandardAirlineITTestSuite.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/test/stdair/StandardAirlineITTestSuite.cpp b/test/stdair/StandardAirlineITTestSuite.cpp
|
||||
index ce04aa5..892d922 100644
|
||||
--- a/test/stdair/StandardAirlineITTestSuite.cpp
|
||||
+++ b/test/stdair/StandardAirlineITTestSuite.cpp
|
||||
@@ -61,7 +61,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);
|
||||
}
|
115
stdair.spec
115
stdair.spec
@ -1,21 +1,20 @@
|
||||
#
|
||||
%global mydocs __tmp_docdir
|
||||
#
|
||||
Name: stdair
|
||||
Version: 1.00.2
|
||||
Release: 8%{?dist}
|
||||
Version: 1.00.8
|
||||
Release: 2%{?dist}
|
||||
|
||||
Summary: C++ Standard Airline IT Object Library
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv2+
|
||||
URL: http://%{name}.sourceforge.net
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
||||
Patch0: stdair-boost-1.59-log-format.patch
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
BuildRequires: cmake, python-devel
|
||||
BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel
|
||||
URL: http://github.com/airsim/%{name}
|
||||
Source0: %{url}/archive/%{name}-%{version}.tar.gz
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: boost-python3-devel
|
||||
BuildRequires: soci-mysql-devel
|
||||
BuildRequires: soci-sqlite3-devel
|
||||
BuildRequires: readline-devel
|
||||
|
||||
|
||||
@ -33,10 +32,12 @@ modeling, 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
|
||||
|
||||
# The cmake files have Python version backed in them
|
||||
Requires: (python(abi) = %{python3_version} if python3-devel)
|
||||
|
||||
%description devel
|
||||
This package contains the header files, shared libraries and
|
||||
development helper tools for %{name}. If you would like to develop
|
||||
@ -44,12 +45,10 @@ 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,
|
||||
@ -59,17 +58,14 @@ 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
|
||||
|
||||
# Fix some permissions
|
||||
find $RPM_BUILD_ROOT%{_libexecdir}/%{name} -type f -name '*.sh' -exec chmod +x {} \;
|
||||
@ -80,22 +76,13 @@ 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
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc ChangeLog COPYING AUTHORS NEWS README
|
||||
%doc ChangeLog COPYING AUTHORS NEWS README.md
|
||||
%{_bindir}/%{name}
|
||||
%{_libdir}/lib%{name}.so.*
|
||||
%{_libdir}/lib%{name}uicl.so.*
|
||||
@ -129,7 +116,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/%{name}/samples/QForecasting/*.csv
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/%{name}
|
||||
%{_bindir}/%{name}-config
|
||||
%{_libdir}/lib%{name}.so
|
||||
@ -141,12 +127,69 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man3/%{name}-library.3.*
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc %{mydocs}/html
|
||||
%doc COPYING
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jul 11 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.8-1
|
||||
- CMake support files updated for Python 3.8
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.7-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jan 24 2019 Jonathan Wakely <jwakely@redhat.com> - 1.00.7-3
|
||||
- Rebuilt for Boost 1.69
|
||||
|
||||
* Thu Jan 17 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.7-2
|
||||
- Fixed a typo in Python library directory
|
||||
|
||||
* Tue Jan 15 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.7-1
|
||||
- Upstream update
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.6-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu May 10 2018 Jonathan Wakely <jwakely@redhat.com> - 1.00.6-4
|
||||
- Add BuildRequires: boost-python2-devel to fix build with boost-1.66.0-7.fc29
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.6-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Mon Jan 22 2018 Jonathan Wakely <jwakely@redhat.com> - 1.00.6-2
|
||||
- Rebuilt for Boost 1.66
|
||||
|
||||
* Sun Aug 06 2017 Denis Arnaud <denis_arnaud at users dot sourceforge dot net> - 1.00.6
|
||||
- Fixed the FTBFS issue related to newer Boost Serialization (from 1.63).
|
||||
Ref: StdAir issue #2 on GitHub (http://github.com/airsim/stdair/issues/2)
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.5-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Sat Jul 29 2017 Filipe Rosset <rosset.filipe@gmail.com> - 1.00.5-5
|
||||
- Spec clean up
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.5-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sun Jul 23 2017 Björn Esser <besser82@fedoraproject.org> - 1.00.5-3
|
||||
- Rebuilt for Boost 1.64
|
||||
|
||||
* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
|
||||
|
||||
* Sun Feb 26 2017 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.5-1
|
||||
- Upstream update
|
||||
|
||||
* Sat Feb 25 2017 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.2-12
|
||||
- Attempt to fix the FTBFS issue related to new Boost 1.63 serialization
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue May 17 2016 Jonathan Wakely <jwakely@redhat.com> - 1.00.2-8
|
||||
- Rebuilt for linker errors in boost (#1331983)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user