Compare commits
No commits in common. "rawhide" and "f25" have entirely different histories.
|
|
@ -0,0 +1,38 @@
|
|||
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
|
||||
|
||||
179
airrac.spec
179
airrac.spec
|
|
@ -1,21 +1,24 @@
|
|||
#
|
||||
%global mydocs __tmp_docdir
|
||||
#
|
||||
Name: airrac
|
||||
Version: 1.00.7
|
||||
Release: %autorelease
|
||||
Version: 1.00.1
|
||||
Release: 8%{?dist}
|
||||
|
||||
Summary: C++ Simulated Revenue Accounting (RAC) System Library
|
||||
|
||||
License: LGPL-2.1-or-later
|
||||
URL: https://github.com/airsim/%{name}
|
||||
Source0: %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
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
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
BuildRequires: cmake, python-devel
|
||||
BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: stdair-devel
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: soci-mysql-devel
|
||||
BuildRequires: soci-sqlite3-devel
|
||||
BuildRequires: pkgconfig(readline)
|
||||
BuildRequires: pkgconfig(stdair)
|
||||
|
||||
%description
|
||||
%{name} is a C++ library of airline revenue accounting classes and
|
||||
|
|
@ -23,13 +26,14 @@ functions, mainly targeting simulation purposes.
|
|||
|
||||
%{name} makes an extensive use of existing open-source libraries for
|
||||
increased functionality, speed and accuracy. In particular the
|
||||
Boost (C++ Standard Extensions: https://www.boost.org) library is used.
|
||||
Boost (C++ Standard Extensions: http://www.boost.org) library is used.
|
||||
|
||||
Install the %{name} package if you need a library of basic C++ objects
|
||||
for Airline Revenue Accounting, 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
|
||||
|
||||
|
|
@ -40,50 +44,62 @@ 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: texlive-epstopdf
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: ghostscript
|
||||
BuildRequires: doxygen, 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
|
||||
(https://doxygen.org). The content is the same as what can be browsed
|
||||
online (https://%{name}.org).
|
||||
(http://doxygen.org). The content is the same as what can be browsed
|
||||
online (http://%{name}.org).
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
|
||||
%build
|
||||
%cmake
|
||||
%cmake_build
|
||||
%cmake .
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
# Remove the Doxygen installer
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/html/installdox
|
||||
mkdir -p %{mydocs}
|
||||
mv $RPM_BUILD_ROOT%{_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.md,AUTHORS}
|
||||
rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README,AUTHORS}
|
||||
|
||||
%check
|
||||
%ctest
|
||||
ctest
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%doc AUTHORS ChangeLog NEWS README.md
|
||||
%license COPYING
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README
|
||||
%{_bindir}/%{name}
|
||||
%{_libdir}/lib%{name}.so.*
|
||||
%{_mandir}/man1/%{name}.1.*
|
||||
|
||||
%files devel
|
||||
%{_includedir}/%{name}/
|
||||
%defattr(-,root,root,-)
|
||||
%{_includedir}/%{name}
|
||||
%{_bindir}/%{name}-config
|
||||
%{_libdir}/lib%{name}.so
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
|
|
@ -94,10 +110,109 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README.md,AUTHORS}
|
|||
%{_mandir}/man3/%{name}-library.3.*
|
||||
|
||||
%files doc
|
||||
%doc %{_docdir}/%{name}/
|
||||
%license COPYING
|
||||
%defattr(-,root,root,-)
|
||||
%doc %{mydocs}/html
|
||||
%doc COPYING
|
||||
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.00.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Mon Jan 18 2016 Jonathan Wakely <jwakely@redhat.com> - 1.00.1-7
|
||||
- Rebuilt for Boost 1.60
|
||||
|
||||
* Sun Aug 30 2015 Jonathan Wakely <jwakely@redhat.com> 1.00.1-6
|
||||
- Patched and rebuilt for Boost 1.59
|
||||
|
||||
* Sat Aug 29 2015 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-5
|
||||
- Mass rebuild
|
||||
|
||||
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
|
||||
|
||||
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1.00.1-3
|
||||
- rebuild for Boost 1.58
|
||||
|
||||
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sun Jun 07 2015 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-1
|
||||
- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir)
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.00.0-12
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1.00.0-11
|
||||
- Rebuild for boost 1.57.0
|
||||
- Cmake should look for zmq.h, not zmq.hpp (stdair-1.00.1-cmake.patch)
|
||||
|
||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri May 23 2014 David Tardon <dtardon@redhat.com> - 1.00.0-8
|
||||
- rebuild for boost 1.55.0
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.00.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Mon Jul 29 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.0-6
|
||||
- Fixed the docdir issue, following the F20 System Wide Change
|
||||
|
||||
* Sun Jul 28 2013 Petr Machata <pmachata@redhat.com> - 1.00.0-5
|
||||
- Rebuild for boost 1.54.0
|
||||
|
||||
* Wed May 22 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.0-4
|
||||
- Rebuild for Soci-3.2.1
|
||||
|
||||
* Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.0-3
|
||||
- Rebuild for Boost-1.53.0
|
||||
|
||||
* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.0-2
|
||||
- Rebuild for Boost-1.53.0
|
||||
|
||||
* Tue Dec 25 2012 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.0-1
|
||||
- Upstream update
|
||||
|
||||
* Sun Aug 12 2012 Kevin Fenzi <kevin@scrye.com> - 0.2.3-5
|
||||
- Rebuild for new boost
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.3-3
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Dec 05 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.2.3-1
|
||||
- Upstream update
|
||||
|
||||
* Sun Nov 20 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.2.1-2
|
||||
- Rebuild for the new Boost-1.48.0
|
||||
|
||||
* Wed Nov 02 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.2.1-1
|
||||
- Upstream update
|
||||
|
||||
* Wed Nov 02 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.2.0-3
|
||||
- Rebuilt for the new soci-3.1.0 and stdair-0.44.0 packages
|
||||
|
||||
* Sat Oct 15 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.2.0-1
|
||||
- Upstream update
|
||||
|
||||
* Tue Aug 30 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.1.2-1
|
||||
- Upstream update
|
||||
|
||||
* Sat Aug 20 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.1.1-1
|
||||
- Removed the need for Graphviz: the class diagrams are no longer
|
||||
built with it
|
||||
|
||||
* Fri Aug 19 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.1.0-2
|
||||
- Took into account the feedback from the package review (#728649)
|
||||
|
||||
* Fri Aug 05 2011 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.1.0-1
|
||||
- First package
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (airrac-1.00.7.tar.gz) = 86c4acb8249fefe2a284009fe4b4757dec6bae0f971ff30e8abd5dde086bdd9a0674b318035d884aeb9cd59d792f525872e7665db9d4f494ebcae97cc310bbb8
|
||||
5abd241dfbd738d9f2fe9617c4047471 airrac-1.00.1.tar.bz2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
diff -up stdair-1.00.1/config/FindZeroMQ.cmake\~ stdair-1.00.1/config/FindZeroMQ.cmake
|
||||
--- stdair-1.00.1/config/FindZeroMQ.cmake~ 2012-12-22 11:44:25.000000000 +0100
|
||||
+++ stdair-1.00.1/config/FindZeroMQ.cmake 2015-01-28 10:12:48.786823055 +0100
|
||||
@@ -25,7 +25,7 @@ find_library (ZeroMQ_LIBRARIES
|
||||
HINTS ${ZeroMQ_ROOT_DIR}/lib)
|
||||
|
||||
find_path (ZeroMQ_INCLUDE_DIR
|
||||
- NAMES zmq.hpp
|
||||
+ NAMES zmq.h
|
||||
HINTS ${ZeroMQ_ROOT_DIR}/include)
|
||||
|
||||
#
|
||||
|
||||
Diff finished. Wed Jan 28 10:13:03 2015
|
||||
Loading…
Reference in New Issue