diff --git a/.gitignore b/.gitignore index cba29db..a188f56 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,5 @@ /noarch/ /x86_64/ /i?86/ - +/tarballs/ diff --git a/sevmgr.spec b/sevmgr.spec index 9d3d02d..217fd39 100644 --- a/sevmgr.spec +++ b/sevmgr.spec @@ -1,22 +1,23 @@ # -%global mydocs __tmp_docdir -# Name: sevmgr -Version: 1.00.0 -Release: 8%{?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 -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -BuildRequires: cmake, python-devel -BuildRequires: boost-devel, soci-mysql-devel, zeromq-devel -BuildRequires: readline-devel, 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 @@ -24,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 @@ -42,54 +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 - +%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}-%{version}/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}-%{version}/{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.* @@ -97,57 +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 -* 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 f355fc8..ab192a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2374c495cb0fc7b1f16f2112533b6a1d sevmgr-1.00.0.tar.bz2 +SHA512 (sevmgr-1.00.15.tar.gz) = 2b9a0237dbcc004baa7277ceee68f7215314726f105cad609a2109768c1af24cc487a297e2ea77e943a5daffec5c4961d5c6ae1863dcfa042b27b8f02442b5e0