Skip to content

L
libzmq
Commit c2fbb722 authored by Pieter Hintjens's avatar Pieter Hintjens
Browse files
Options

Merge pull request #496 from amuraru/master 

Fixed el5/el6 deps in RPM spec file / newline fix
parents 7d475add 35f18aef
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
builds/redhat/zeromq.spec.in
View file @ c2fbb722
...@@ -11,12 +11,15 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root ...@@ -11,12 +11,15 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gcc, make, gcc-c++, libstdc++-devel BuildRequires: gcc, make, gcc-c++, libstdc++-devel
Requires: libstdc++ Requires: libstdc++
%if %{?rhel}%{!?rhel:0} >= 6 %if 0%{?rhel}
%if 0%{?rhel} == 6
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
Requires: libuuid Requires: libuuid
%elseif %{?rhel}%{!?rhel:0} >= 5 %endif
%if 0%{?rhel} == 5
BuildRequires: e2fsprogs-devel BuildRequires: e2fsprogs-devel
Requires: e2fsprogs Requires: e2fsprogs
%endif
%else %else
BuildRequires: uuid-devel BuildRequires: uuid-devel
Requires: uuid Requires: uuid
...@@ -57,7 +60,7 @@ This package contains ZeroMQ related development libraries and header files. ...@@ -57,7 +60,7 @@ This package contains ZeroMQ related development libraries and header files.
%build %build
%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64 %ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
%configure --with-pgm %configure --with-pgm --with-pic --with-gnu-ld
%else %else
%configure %configure
%endif %endif
......
tests/test_disconnect_inproc.cpp
View file @ c2fbb722
...@@ -116,4 +116,5 @@ int main(int argc, char** argv) { ...@@ -116,4 +116,5 @@ int main(int argc, char** argv) {
zmq_ctx_destroy(context); zmq_ctx_destroy(context);
return 0; return 0;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment