From ff755af5522098feba4e668bb57995166f8ec353 Mon Sep 17 00:00:00 2001 From: Denis Arnaud Date: Jun 14 2015 01:06:20 +0000 Subject: Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) --- diff --git a/airrac.spec b/airrac.spec index 42e27cc..90ceac0 100644 --- a/airrac.spec +++ b/airrac.spec @@ -2,8 +2,8 @@ %global mydocs __tmp_docdir # Name: airrac -Version: 1.00.0 -Release: 2%{?dist} +Version: 1.00.1 +Release: 1%{?dist} Summary: C++ Simulated Revenue Accounting (RAC) 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, python-devel -BuildRequires: boost-devel, soci-mysql-devel, zeromq-devel, readline-devel +BuildRequires: boost148-devel, soci-mysql-devel, soci-sqlite3-devel +BuildRequires: readline-devel BuildRequires: stdair-devel @@ -43,7 +44,9 @@ programs using %{name}, you will need to install %{name}-devel. %package doc Summary: HTML documentation for the %{name} library Group: Documentation -%{?fedora:BuildArch: noarch} +%if 0%{?fedora} || 0%{?rhel} > 5 +BuildArch: noarch +%endif BuildRequires: tex(latex) BuildRequires: doxygen, ghostscript @@ -59,19 +62,32 @@ online (http://%{name}.org). %build -%cmake . +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 %install rm -rf $RPM_BUILD_ROOT +pushd build 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 +popd %clean rm -rf $RPM_BUILD_ROOT @@ -107,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 07 2015 Denis Arnaud - 1.00.1-1 +- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir) + * Wed May 22 2013 Denis Arnaud - 1.00.0-2 - Rebuild for Soci-3.2.1 diff --git a/sources b/sources index db9c557..e80283c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28be07a348ab9933837c765568e5f263 airrac-1.00.0.tar.bz2 +5abd241dfbd738d9f2fe9617c4047471 airrac-1.00.1.tar.bz2