[airrac] Cmake should look for zmq.h, not zmq.hpp

Petr Machata pmachata at fedoraproject.org
Wed Jan 28 15:54:30 UTC 2015


commit 1ef15ee0628021840b7a48170347fda3edb064b6
Author: Petr Machata <pmachata at redhat.com>
Date:   Wed Jan 28 16:54:12 2015 +0100

    Cmake should look for zmq.h, not zmq.hpp

 airrac.spec               |    3 +++
 stdair-1.00.1-cmake.patch |   14 ++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/airrac.spec b/airrac.spec
index 580c193..5801a99 100644
--- a/airrac.spec
+++ b/airrac.spec
@@ -11,6 +11,7 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://sourceforge.net/projects/%{name}/
 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
@@ -56,6 +57,7 @@ online (http://%{name}.org).
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -113,6 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Jan 27 2015 Petr Machata <pmachata at redhat.com> - 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 <rel-eng at lists.fedoraproject.org> - 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


More information about the scm-commits mailing list