diff --git a/.gitignore b/.gitignore index b5508cc..86275f8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /noarch/ /x86_64/ /i?86/ +/tarballs/ diff --git a/airinv.spec b/airinv.spec index 6fa181f..996a50d 100644 --- a/airinv.spec +++ b/airinv.spec @@ -2,7 +2,7 @@ %global mydocs __tmp_docdir # Name: airinv -Version: 1.00.0 +Version: 1.00.1 Release: 1%{?dist} Summary: C++ Simulated Airline Inventory Management System library @@ -14,7 +14,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: cmake, python26-devel -BuildRequires: boost141-devel, soci-mysql-devel, zeromq-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 @@ -64,9 +65,9 @@ online (http://%{name}.org). %build mkdir -p build pushd build -%cmake -DBOOST_LIBRARYDIR=%{_libdir}/boost141 \ - -DBOOST_INCLUDEDIR=%{_includedir}/boost141 \ - -DBoost_ADDITIONAL_VERSIONS="1.41 1.41.0" .. +%cmake -DBOOST_LIBRARYDIR=%{_libdir}/boost148 \ + -DBOOST_INCLUDEDIR=%{_includedir}/boost148 \ + -DBoost_ADDITIONAL_VERSIONS="1.48 1.48.0" .. make %{?_smp_mflags} popd @@ -77,9 +78,13 @@ make install DESTDIR=$RPM_BUILD_ROOT popd mkdir -p %{mydocs} -mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{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,AUTHORS} + %check pushd build #ctest @@ -125,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %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 diff --git a/sources b/sources index c332fcf..1f47cff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3971d7c5f4f193efdd9fa36f1265ab9e airinv-1.00.0.tar.bz2 +c48e959d710695f3e07a1234649a7582 airinv-1.00.1.tar.bz2