diff --git a/.gitignore b/.gitignore index 7998a05..a188f56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ -clog -sevmgr-*.tar.* -sevmgr-*.src.rpm -.build-*.log -/i?86/ +/sevmgr-*.tar.* +/sevmgr-*.src.rpm +/sevmgr-*.*.*/ +/clog +.build-*.*.log +/noarch/ /x86_64/ +/i?86/ +/tarballs/ + diff --git a/sevmgr.spec b/sevmgr.spec index 0be8aa7..fd31198 100644 --- a/sevmgr.spec +++ b/sevmgr.spec @@ -2,7 +2,7 @@ %global mydocs __tmp_docdir # Name: sevmgr -Version: 0.2.0 +Version: 1.00.2 Release: 1%{?dist} Summary: C++ Simulation-Oriented Discrete Event Management Library @@ -13,9 +13,10 @@ 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 +BuildRequires: cmake, python26-devel +BuildRequires: boost148-devel, soci-mysql-devel, soci-sqlite3-devel +BuildRequires: readline-devel, ncurses-devel +BuildRequires: stdair-devel %description @@ -61,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 -ctest +pushd build +#ctest +popd %clean rm -rf $RPM_BUILD_ROOT @@ -111,6 +125,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 14 2015 Denis Arnaud - 1.00.2-1 +- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not SEvMgr) + +* Sun Dec 23 2012 Denis Arnaud 1.00.1-2 +- Bump the version to create a new build-root override + +* Sun Dec 23 2012 Denis Arnaud 1.00.1-1 +- Upstream update + * Sun Jan 29 2012 Denis Arnaud 0.2.0-1 - First RPM release diff --git a/sources b/sources index 43f5f61..d0d1a99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c2300b3e8abbea7899261e91a605e982 sevmgr-0.2.0.tar.bz2 +e005bdc9330ce6c524c16fd49ba0b11c sevmgr-1.00.2.tar.bz2