Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir)
This commit is contained in:
parent
66ddbee9ff
commit
016ab69773
|
@ -6,3 +6,4 @@
|
|||
/noarch/
|
||||
/x86_64/
|
||||
/i?86/
|
||||
/tarballs/
|
||||
|
|
18
rmol.spec
18
rmol.spec
|
@ -2,8 +2,8 @@
|
|||
%global mydocs __tmp_docdir
|
||||
#
|
||||
Name: rmol
|
||||
Version: 1.00.0
|
||||
Release: 12%{?dist}
|
||||
Version: 1.00.1
|
||||
Release: 1%{?dist}
|
||||
|
||||
Summary: C++ library of Revenue Management and Optimisation classes and functions
|
||||
|
||||
|
@ -11,12 +11,12 @@ 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, zeromq-devel
|
||||
BuildRequires: readline-devel, stdair-devel, airrac-devel
|
||||
BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: stdair-devel, airrac-devel
|
||||
|
||||
|
||||
%description
|
||||
|
@ -67,7 +67,6 @@ online (http://%{name}.org).
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
|
||||
%build
|
||||
|
@ -79,12 +78,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
|
||||
|
@ -127,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Jun 14 2015 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 1.00.1-1
|
||||
- Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir)
|
||||
|
||||
* Sun May 03 2015 Kalev Lember <kalevlember@gmail.com> - 1.00.0-12
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
94fa9af927e10e9b9fc96fdaf136667e rmol-1.00.0.tar.bz2
|
||||
0a16778ad18fa9e232d2c6c081fd350b rmol-1.00.1.tar.bz2
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
diff -up stdair-1.00.1/config/FindZeroMQ.cmake\~ stdair-1.00.1/config/FindZeroMQ.cmake
|
||||
--- stdair-1.00.1/config/FindZeroMQ.cmake~ 2012-12-22 11:44:25.000000000 +0100
|
||||
+++ stdair-1.00.1/config/FindZeroMQ.cmake 2015-01-28 10:12:48.786823055 +0100
|
||||
@@ -25,7 +25,7 @@ find_library (ZeroMQ_LIBRARIES
|
||||
HINTS ${ZeroMQ_ROOT_DIR}/lib)
|
||||
|
||||
find_path (ZeroMQ_INCLUDE_DIR
|
||||
- NAMES zmq.hpp
|
||||
+ NAMES zmq.h
|
||||
HINTS ${ZeroMQ_ROOT_DIR}/include)
|
||||
|
||||
#
|
||||
|
||||
Diff finished. Wed Jan 28 10:13:03 2015
|
Loading…
Reference in New Issue