diff --git a/airinv.spec b/airinv.spec index 996a50d..cfb1514 100644 --- a/airinv.spec +++ b/airinv.spec @@ -1,24 +1,27 @@ # -%global mydocs __tmp_docdir -# Name: airinv -Version: 1.00.1 -Release: 1%{?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 -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -BuildRequires: cmake, python26-devel -BuildRequires: boost148-devel, soci-mysql-devel, soci-sqlite3-devel -BuildRequires: zeromq-devel -BuildRequires: readline-devel, ncurses-devel -BuildRequires: stdair-devel, airrac-devel, rmol-devel, sevmgr-devel - +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 @@ -26,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 @@ -44,63 +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 - +%autosetup %build -mkdir -p build -pushd build -%cmake -DBOOST_LIBRARYDIR=%{_libdir}/boost148 \ - -DBOOST_INCLUDEDIR=%{_includedir}/boost148 \ - -DBoost_ADDITIONAL_VERSIONS="1.48 1.48.0" .. -make %{?_smp_mflags} -popd +%cmake +%cmake_build %install -rm -rf $RPM_BUILD_ROOT -pushd build -make install DESTDIR=$RPM_BUILD_ROOT -popd +%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 -pushd build -#ctest -popd - -%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 @@ -112,33 +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 -* Sun Jun 14 2015 Denis Arnaud - 1.00.1-1 -- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) - -* Tue Dec 25 2012 Denis Arnaud 1.00.0-1 -- Upstream update - -* 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