From fb0beb6f2942cfadb2a22fde97b809f26103741d Mon Sep 17 00:00:00 2001 From: Adrian Muraru Date: Fri, 11 Jan 2013 22:50:31 +0200 Subject: [PATCH 1/2] Fixed el5/el6 deps in RPM spec file --- builds/redhat/zeromq.spec.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/builds/redhat/zeromq.spec.in b/builds/redhat/zeromq.spec.in index 06146643..8261b203 100644 --- a/builds/redhat/zeromq.spec.in +++ b/builds/redhat/zeromq.spec.in @@ -11,12 +11,15 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gcc, make, gcc-c++, libstdc++-devel Requires: libstdc++ -%if %{?rhel}%{!?rhel:0} >= 6 +%if 0%{?rhel} +%if 0%{?rhel} == 6 BuildRequires: libuuid-devel Requires: libuuid -%elseif %{?rhel}%{!?rhel:0} >= 5 +%endif +%if 0%{?rhel} == 5 BuildRequires: e2fsprogs-devel Requires: e2fsprogs +%endif %else BuildRequires: uuid-devel Requires: uuid @@ -57,7 +60,7 @@ This package contains ZeroMQ related development libraries and header files. %build %ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64 - %configure --with-pgm + %configure --with-pgm --with-pic --with-gnu-ld %else %configure %endif From 35f18aef74bf016e00ba60b84af267054a38968f Mon Sep 17 00:00:00 2001 From: Adrian Muraru Date: Fri, 11 Jan 2013 22:51:08 +0200 Subject: [PATCH 2/2] Fixed newline in test_disconnect_inproc --- tests/test_disconnect_inproc.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_disconnect_inproc.cpp b/tests/test_disconnect_inproc.cpp index 33b42160..78750830 100644 --- a/tests/test_disconnect_inproc.cpp +++ b/tests/test_disconnect_inproc.cpp @@ -116,4 +116,5 @@ int main(int argc, char** argv) { zmq_ctx_destroy(context); return 0; -} \ No newline at end of file +} +