summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-10-13 08:01:13 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-10-13 08:01:13 +0200
commit5ae878b891fa5189f5202f1577d22bdb9ba51f77 (patch)
tree93d278bf896dda18fb22a08c1b0ac20e6b192d40
parent954d7f743dbc0c159794915c6deadc374dbf64d2 (diff)
parent2568947a71adc0e8ddad54b6054a3b3e532e1613 (diff)
Merge branch 'maint'
* maint: Add support for RHEL6 in the spec file
-rw-r--r--AUTHORS1
-rw-r--r--builds/redhat/zeromq.spec7
2 files changed, 8 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index ab05561..fb0b697 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,6 +36,7 @@ Pavel Gushcha <pavimus@gmail.com>
Pavol Malosek <malosek@fastmq.com>
Pieter Hintjens <ph@imatix.com>
Piotr Trojanek <piotr.trojanek@gmail.com>
+Sebastian Otaegui <feniix@gmail.com>
Steven McCoy <steven.mccoy@miru.hk>
Tamara Kustarova <kustarova.tamara@gmail.com>
Tero Marttila <terom@fixme.fi>
diff --git a/builds/redhat/zeromq.spec b/builds/redhat/zeromq.spec
index 781c65d..28e5c94 100644
--- a/builds/redhat/zeromq.spec
+++ b/builds/redhat/zeromq.spec
@@ -8,7 +8,11 @@ URL: http://www.zeromq.org/
Source: http://www.zeromq.org/local--files/area:download/%{name}-%{version}.tar.gz
Prefix: %{_prefix}
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+%if %{?rhel}%{!?rhel:0} >= 6
+BuildRequires: libuuid-devel, gcc, make, gcc-c++, libstdc++-devel
+%else
BuildRequires: uuid-devel, gcc, make, gcc-c++, libstdc++-devel
+%endif
Requires: uuid, libstdc++
# Build pgm only on supported archs
@@ -92,6 +96,7 @@ This package contains ZeroMQ related development libraries and header files.
%defattr(-,root,root,-)
%{_includedir}/zmq.h
%{_includedir}/zmq.hpp
+%{_includedir}/zmq_utils.h
%{_libdir}/libzmq.la
%{_libdir}/libzmq.a
@@ -101,6 +106,8 @@ This package contains ZeroMQ related development libraries and header files.
%{_mandir}/man3/zmq_bind.3.gz
%{_mandir}/man3/zmq_close.3.gz
%{_mandir}/man3/zmq_connect.3.gz
+%{_mandir}/man3/zmq_errno.3.gz
+%{_mandir}/man3/zmq_getsockopt.3.gz
%{_mandir}/man3/zmq_init.3.gz
%{_mandir}/man3/zmq_msg_close.3.gz
%{_mandir}/man3/zmq_msg_copy.3.gz