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 21cd6f1..0000000 --- a/0001-Fix-for-Boost-1.59.0-compatibility.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 54ebac3f58456feba93e54ef74678bce69863e30 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Sun, 30 Aug 2015 01:01:53 +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/sevmgr/EventQueueManagementTestSuite.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/test/sevmgr/EventQueueManagementTestSuite.cpp b/test/sevmgr/EventQueueManagementTestSuite.cpp -index 4357153..7bad06c 100644 ---- a/test/sevmgr/EventQueueManagementTestSuite.cpp -+++ b/test/sevmgr/EventQueueManagementTestSuite.cpp -@@ -16,6 +16,7 @@ - #define BOOST_TEST_MODULE EventQueueManagementTest - #include - #include -+#include - // StdAir - #include - #include -@@ -43,7 +44,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/sevmgr.spec b/sevmgr.spec index 4699295..217fd39 100644 --- a/sevmgr.spec +++ b/sevmgr.spec @@ -1,24 +1,23 @@ # -%global mydocs __tmp_docdir -# Name: sevmgr -Version: 1.00.2 -Release: 11%{?dist} +Version: 1.00.15 +Release: %autorelease Summary: C++ Simulation-Oriented Discrete Event Management Library -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 -BuildRequires: readline-devel -BuildRequires: stdair-devel +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 +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: boost-devel +BuildRequires: soci-devel +BuildRequires: soci-mysql-devel +BuildRequires: soci-sqlite3-devel +BuildRequires: soci-postgresql-devel +BuildRequires: pkgconfig(readline) +BuildRequires: pkgconfig(stdair) %description %{name} is a C++ library of discrete event queue management classes and @@ -26,14 +25,13 @@ functions, exclusively 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 the discrete event queue management of your simulation project. %package devel Summary: Header files, libraries and development helper tools for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -44,55 +42,42 @@ 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.md,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}_demo %{_libdir}/lib%{name}.so.* @@ -100,105 +85,20 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}_demo.1.* %files devel -%defattr(-,root,root,-) -%{_includedir}/%{name} +%{_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 -* Sat Feb 11 2017 Fedora Release Engineering - 1.00.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jan 12 2017 Igor Gnatenko - 1.00.2-10 -- Rebuild for readline 7.x - -* Tue May 17 2016 Jonathan Wakely - 1.00.2-9 -- Rebuilt for linker errors in boost (#1331983) - -* Thu Feb 04 2016 Fedora Release Engineering - 1.00.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jan 18 2016 Jonathan Wakely - 1.00.2-7 -- Rebuilt for Boost 1.60 - -* Sun Aug 30 2015 Jonathan Wakely 1.00.2-6 -- Patched and rebuilt for Boost 1.59 - -* Sat Aug 29 2015 Denis Arnaud - 1.00.2-5 -- Mass rebuild - -* Wed Jul 29 2015 Fedora Release Engineering - 1.00.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 1.00.2-3 -- rebuild for Boost 1.58 - -* Fri Jun 19 2015 Fedora Release Engineering - 1.00.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 14 2015 Denis Arnaud - 1.00.2-1 -- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) - -* Sat May 02 2015 Kalev Lember - 1.00.0-13 -- Rebuilt for GCC 5 C++11 ABI change - -* Wed Jan 28 2015 Petr Machata - 1.00.0-12 -- Rebuild for boost 1.57.0 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.00.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.00.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 David Tardon - 1.00.0-9 -- rebuild for boost 1.55.0 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.00.0-8 -- 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 - -* Sun Jul 28 2013 Petr Machata - 1.00.0-6 -- Rebuild for boost 1.54.0 - -* Wed May 22 2013 Denis Arnaud - 1.00.0-5 -- Rebuild for Soci-3.2.1 - -* Sun Feb 10 2013 Denis Arnaud - 1.00.0-4 -- Rebuild for Boost-1.53.0 - -* Sat Feb 09 2013 Denis Arnaud - 1.00.0-3 -- Rebuild for Boost-1.53.0 - -* Wed Jan 02 2013 Denis Arnaud 1.00.0-2 -- Bump the version to be consistent with F18 - -* Sun Dec 23 2012 Denis Arnaud 1.00.0-1 -- Upstream update - -* Mon Aug 13 2012 Denis Arnaud - 0.2.0-4 -- Rebuilt for new Boost 1.50.0. - -* Sat Jul 21 2012 Fedora Release Engineering - 0.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Feb 28 2012 Fedora Release Engineering - 0.2.0-2 -- Rebuilt for c++ ABI breakage - -* Sun Jan 29 2012 Denis Arnaud 0.2.0-1 -- First RPM release +%autochangelog diff --git a/sources b/sources index d0d1a99..ab192a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e005bdc9330ce6c524c16fd49ba0b11c sevmgr-1.00.2.tar.bz2 +SHA512 (sevmgr-1.00.15.tar.gz) = 2b9a0237dbcc004baa7277ceee68f7215314726f105cad609a2109768c1af24cc487a297e2ea77e943a5daffec5c4961d5c6ae1863dcfa042b27b8f02442b5e0