[zeromq] Build against openpgm

tomspur tomspur at fedoraproject.org
Mon Dec 24 17:50:31 UTC 2012


commit 084946f586a7f2519b136fa010827cda0afb2e13
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Mon Dec 24 18:50:04 2012 +0100

    Build against openpgm
    
    - add bcond_without pgm macro (Jose Pedro Oliveira, #867182)
    - remove bundled pgm
    - build against openpgm

 zeromq.spec |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/zeromq.spec b/zeromq.spec
index 6f3e29a..dea35a7 100644
--- a/zeromq.spec
+++ b/zeromq.spec
@@ -1,6 +1,8 @@
+%bcond_without pgm
+
 Name:           zeromq
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Software library for fast, message-based applications
 
 Group:          System Environment/Libraries
@@ -16,6 +18,9 @@ BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %else
 BuildRequires:  libuuid-devel
 %endif
+%if %{with pgm}
+BuildRequires:  openpgm-devel >= 5.1
+%endif
 
 # utils subpackage was removed in F-16
 # -> can be deleted in F-19
@@ -50,9 +55,16 @@ developing applications that use %{name}.
 sed -i "s/libzmq_werror=\"yes\"/libzmq_werror=\"no\"/g" \
     configure
 
+# remove bundled libraries
+rm -rvf foreign/*/*tar*
+
 
 %build
-%configure --disable-static
+%configure \
+%if %{with pgm}
+            --with-system-pgm \
+%endif
+            --disable-static
 make %{?_smp_mflags}
 
 
@@ -89,6 +101,11 @@ make check
 
 
 %changelog
+* Mon Dec 24 2012 Thomas Spura <tomspur at fedoraproject.org> - 2.2.0-3
+- add bcond_without pgm macro (Jose Pedro Oliveira, #867182)
+- remove bundled pgm
+- build against openpgm
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list