diff --git a/0001-Fix-for-Boost-1.59.0-compatibility.patch b/0001-Fix-for-Boost-1.59.0-compatibility.patch deleted file mode 100644 index 7ff671c..0000000 --- a/0001-Fix-for-Boost-1.59.0-compatibility.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b86f7d78e401271f5bd0b60ab4403a1db8b57f35 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Sun, 30 Aug 2015 02:05: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/airinv/InventoryTestSuite.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/test/airinv/InventoryTestSuite.cpp b/test/airinv/InventoryTestSuite.cpp -index bdd3083..9930aee 100644 ---- a/test/airinv/InventoryTestSuite.cpp -+++ b/test/airinv/InventoryTestSuite.cpp -@@ -14,6 +14,7 @@ - #define BOOST_TEST_MAIN - #define BOOST_TEST_MODULE InventoryTestSuite - #include -+#include - // StdAir - #include - #include -@@ -39,7 +40,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 - diff --git a/airinv.spec b/airinv.spec index 133aa51..cfb1514 100644 --- a/airinv.spec +++ b/airinv.spec @@ -1,31 +1,27 @@ # -%global mydocs __tmp_docdir -# Name: airinv -Version: 1.00.1 -Release: 10%{?dist} +Version: 1.00.14 +Release: %autorelease Summary: C++ Simulated Airline Inventory Management 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://%{name}.sourceforge.net -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 -# FIXME: Workaround to RHBZ#1190463 -%if 0%{?fedora} >= 22 -BuildRequires: zeromq-devel, cppzmq-devel -%else -BuildRequires: zeromq-devel -%endif -BuildRequires: readline-devel -BuildRequires: stdair-devel, airrac-devel, rmol-devel, sevmgr-devel -BuildRequires: /usr/bin/epstopdf - +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: boost-devel +BuildRequires: pkgconfig(readline) +BuildRequires: pkgconfig(libzmq) +BuildRequires: pkgconfig(cppzmq) +BuildRequires: soci-devel +BuildRequires: soci-mysql-devel +BuildRequires: soci-sqlite3-devel +BuildRequires: soci-postgresql-devel +BuildRequires: pkgconfig(stdair) +BuildRequires: pkgconfig(airrac) +BuildRequires: pkgconfig(rmol) +BuildRequires: pkgconfig(sevmgr) %description %{name} is a C++ library of airline inventory management classes and @@ -33,14 +29,13 @@ 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: http://www.boost.org) library is used. +Boost (C++ Standard Extensions: https://www.boost.org) library is used. Install the %{name} package if you need a library of basic C++ objects for Airline Inventory Management, 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 @@ -51,55 +46,43 @@ 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: texlive-epstopdf +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). +(https://doxygen.org). The content is the same as what can be browsed +online (https://github.com/airsim/%{name}). %prep -%setup -q -%patch0 -p1 - +%autosetup %build -%cmake . -make %{?_smp_mflags} +%cmake +%cmake_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%cmake_install -mkdir -p %{mydocs} -mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html %{mydocs} -rm -f %{mydocs}/html/installdox +# Remove the Doxygen installer +rm -f %{buildroot}%{_docdir}/%{name}/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} %check -ctest - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ctest %files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README +%doc AUTHORS ChangeLog NEWS README.md +%license COPYING %{_bindir}/%{name} %{_bindir}/%{name}_parseInventory %{_bindir}/AirInvClient @@ -111,111 +94,21 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/AirInvServer.1.* %files devel -%defattr(-,root,root,-) -%{_includedir}/%{name} +%license COPYING +%{_includedir}/%{name}/ %{_bindir}/%{name}-config %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/%{name}/ %{_datadir}/aclocal/%{name}.m4 -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/CMake %{_mandir}/man1/%{name}-config.1.* %{_mandir}/man3/%{name}-library.3.* %files doc -%defattr(-,root,root,-) -%doc %{mydocs}/html -%doc COPYING +%doc %{_docdir}/%{name}/ +%license COPYING %changelog -* Wed May 18 2016 Jonathan Wakely - 1.00.1-10 -- Rebuilt for linker errors in boost (#1331983) - -* Wed Feb 03 2016 Fedora Release Engineering - 1.00.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jan 18 2016 Jonathan Wakely - 1.00.1-8 -- Rebuilt for Boost 1.60 - -* Sun Aug 30 2015 Jonathan Wakely 1.00.1-7 -- Patched and rebuilt for Boost 1.59 - -* Sat Aug 29 2015 Denis Arnaud - 1.00.1-6 -- Mass rebuild - -* Wed Jul 29 2015 Fedora Release Engineering - 1.00.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 1.00.1-4 -- rebuild for Boost 1.58 - -* Tue Jun 23 2015 Thomas Spura - 1.00.1-3 -- rebuilt for new zeromq 4.1.2 - -* Tue Jun 16 2015 Fedora Release Engineering - 1.00.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 14 2015 Denis Arnaud - 1.00.1-1 -- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) - -* Mon May 04 2015 Kalev Lember - 1.00.0-13 -- Rebuilt for GCC 5 C++11 ABI change - -* Sun Feb 08 2015 Ralf Corsépius - 1.00.0-12 -- BR: zeromq2-devel (Work around RHBZ#1190463; Fix boost-1.57 FTBFS). -- BR: /usr/bin/epstopdf. - -* Thu Jan 29 2015 Petr Machata - 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 - 1.00.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.00.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun May 25 2014 Petr Machata - 1.00.0-8 -- Rebuild for boost 1.55.0 - -* Fri May 23 2014 David Tardon - 1.00.0-7 -- rebuild for boost 1.55.0 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.00.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jul 29 2013 Denis Arnaud - 1.00.0-5 -- Fixed the docdir issue, following the F20 System Wide Change -- Rebuild for boost 1.54.0 - -* Wed May 22 2013 Denis Arnaud - 1.00.0-4 -- Rebuild for Soci-3.2.1 - -* Sun Feb 10 2013 Denis Arnaud - 1.00.0-3 -- Rebuild for Boost-1.53.0 - -* Sat Feb 09 2013 Denis Arnaud - 1.00.0-2 -- Rebuild for Boost-1.53.0 - -* Tue Dec 25 2012 Denis Arnaud 1.00.0-1 -- Upstream update - -* Sun Aug 12 2012 Kevin Fenzi - 0.1.2-5 -- Rebuilt for new boost - -* Wed Jul 18 2012 Fedora Release Engineering - 0.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 0.1.2-3 -- Rebuilt for c++ ABI breakage - -* Thu Jan 12 2012 Fedora Release Engineering - 0.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Dec 04 2011 Denis Arnaud 0.1.2-1 -- Upstream update. Took into account review request (#750099) - -* Sun Oct 30 2011 Denis Arnaud 0.1.1-1 -- First RPM release +%autochangelog diff --git a/sources b/sources index 1f47cff..6efea7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c48e959d710695f3e07a1234649a7582 airinv-1.00.1.tar.bz2 +SHA512 (airinv-1.00.14.tar.gz) = f5b42ef2c99e77bfe9aebd7ec654e7b8956ffc2d4958d2811bd78c19f9d8f79f03ef9aba9ba3335a62e6b0b8bd4f2208544c0248e25ecc843be5bb28410829b5 diff --git a/stdair-1.00.1-cmake.patch b/stdair-1.00.1-cmake.patch deleted file mode 100644 index 66c5091..0000000 --- a/stdair-1.00.1-cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -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