From 1984438ba31db75c312ba3a10426130f5856ca85 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Jun 14 2015 17:57:26 +0000 Subject: Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) --- 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 aa087ac..8de3562 100644 --- a/airinv.spec +++ b/airinv.spec @@ -2,8 +2,8 @@ %global mydocs __tmp_docdir # Name: airinv -Version: 1.00.0 -Release: 13%{?dist} +Version: 1.00.1 +Release: 1%{?dist} Summary: C++ Simulated Airline Inventory Management System library @@ -11,14 +11,13 @@ Group: System Environment/Libraries License: LGPLv2+ URL: http://%{name}.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -Patch0: stdair-1.00.1-cmake.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: cmake, python-devel -BuildRequires: boost-devel, soci-mysql-devel +BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel # FIXME: Workaround to RHBZ#1190463 %if 0%{?fedora} >= 22 -BuildRequires: zeromq2-devel +BuildRequires: zeromq-devel, cppzmq-devel %else BuildRequires: zeromq-devel %endif @@ -67,7 +66,6 @@ online (http://%{name}.org). %prep %setup -q -%patch0 -p1 %build @@ -79,12 +77,12 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT 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}-%{version}/{NEWS,README,AUTHORS} +rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README,AUTHORS} %check ctest @@ -129,6 +127,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) + * Mon May 04 2015 Kalev Lember - 1.00.0-13 - Rebuilt for GCC 5 C++11 ABI change