rpms
/
rmol
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the dependency on ZeroMQ (only AirInv is dependent on it, not StdAir)

This commit is contained in:
Denis Arnaud 2015-06-14 17:29:43 +02:00
parent 66ddbee9ff
commit 016ab69773
4 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/noarch/ /noarch/
/x86_64/ /x86_64/
/i?86/ /i?86/
/tarballs/

18
rmol.spec
View File

@ -2,8 +2,8 @@
%global mydocs __tmp_docdir %global mydocs __tmp_docdir
# #
Name: rmol Name: rmol
Version: 1.00.0 Version: 1.00.1
Release: 12%{?dist} Release: 1%{?dist}
Summary: C++ library of Revenue Management and Optimisation classes and functions Summary: C++ library of Revenue Management and Optimisation classes and functions
@ -11,12 +11,12 @@ Group: System Environment/Libraries
License: LGPLv2+ License: LGPLv2+
URL: http://%{name}.sourceforge.net URL: http://%{name}.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 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) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: cmake, python-devel BuildRequires: cmake, python-devel
BuildRequires: boost-devel, soci-mysql-devel, zeromq-devel BuildRequires: boost-devel, soci-mysql-devel, soci-sqlite3-devel
BuildRequires: readline-devel, stdair-devel, airrac-devel BuildRequires: readline-devel
BuildRequires: stdair-devel, airrac-devel
%description %description
@ -67,7 +67,6 @@ online (http://%{name}.org).
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
@ -79,12 +78,12 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p %{mydocs} 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 rm -f %{mydocs}/html/installdox
# Remove additional documentation files (those files are already available # Remove additional documentation files (those files are already available
# in the project top directory) # 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 %check
ctest ctest
@ -127,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %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 * Sun May 03 2015 Kalev Lember <kalevlember@gmail.com> - 1.00.0-12
- Rebuilt for GCC 5 C++11 ABI change - Rebuilt for GCC 5 C++11 ABI change

2
sources
View File

@ -1 +1 @@
94fa9af927e10e9b9fc96fdaf136667e rmol-1.00.0.tar.bz2 0a16778ad18fa9e232d2c6c081fd350b rmol-1.00.1.tar.bz2

14
stdair-1.00.1-cmake.patch
View File

@ -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