From 3f8312e0af5b468fcb9142d94070d4163a75c479 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Jan 28 2015 15:49:27 +0000 Subject: Cmake should look for zmq.h, not zmq.hpp --- diff --git a/airsched.spec b/airsched.spec index 6840e38..aaab0e6 100644 --- a/airsched.spec +++ b/airsched.spec @@ -13,6 +13,7 @@ Group: System Environment/Libraries License: LGPLv2+ URL: http://%{sfname}.sourceforge.net Source0: http://downloads.sourceforge.net/%{sfname}/%{sfalias}-%{version}.tar.bz2 +Patch0: stdair-1.00.1-cmake.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: cmake, python-devel @@ -62,6 +63,7 @@ online (http://%{name}.org). %prep %setup -q +%patch0 -p1 %build @@ -119,6 +121,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Jan 28 2015 Petr Machata - 1.00.0-11 - Rebuild for boost 1.57.0 +- Cmake should look for zmq.h, not zmq.hpp (stdair-1.00.1-cmake.patch) * Fri Aug 15 2014 Fedora Release Engineering - 1.00.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/stdair-1.00.1-cmake.patch b/stdair-1.00.1-cmake.patch new file mode 100644 index 0000000..66c5091 --- /dev/null +++ b/stdair-1.00.1-cmake.patch @@ -0,0 +1,14 @@ +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