[zeromq3] bcond_with macro for building against openpqm (not in Fedora yet)

tomspur tomspur at fedoraproject.org
Fri Dec 14 12:13:42 UTC 2012


commit f1f859b3f8ec605b265ddcbd7e073487576ce5de
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Fri Dec 14 13:12:57 2012 +0100

    bcond_with macro for building against openpqm (not in Fedora yet)
    
    - add bcond_with pgm macro (Jose Pedro Oliveira, #867182)
    - remove bundled pgm
    - add zeromq-3 git repository

 zeromq3.spec |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/zeromq3.spec b/zeromq3.spec
index 1d1de95..1f16eac 100644
--- a/zeromq3.spec
+++ b/zeromq3.spec
@@ -1,3 +1,5 @@
+%bcond_with pgm
+
 Name:           zeromq3
 Version:        3.2.2
 Release:        1%{?dist}
@@ -6,7 +8,8 @@ Summary:        Software library for fast, message-based applications
 Group:          System Environment/Libraries
 License:        LGPLv3+
 URL:            http://www.zeromq.org
-# VCS:          git:http://github.com/zeromq/libzmq.git
+# VCS:          git:git://github.com/zeromq/libzmq.git
+# VCS:          git:git://github.com/zeromq/zeromq3-x.git
 #####
 #Source0:        http://download.zeromq.org/zeromq-%%{version}.tar.gz
 #####
@@ -23,6 +26,10 @@ Source0:        http://download.zeromq.org/zeromq-%{version}.tar.gz
 #####
 BuildRequires:  glib2-devel
 BuildRequires:  libuuid-devel
+%if %{with pgm}
+# not in fedora yet
+BuildRequires:  openpgm-devel >= 5.1
+%endif
 
 
 %description
@@ -51,13 +58,20 @@ developing applications that use %{name} 3.x.
 %prep
 %setup -qn zeromq-%{version}
 
+# remove bundled libraries
+rm -rvf foreign/*/*tar*
+
 # Don't turn warnings into errors
 sed -i "s/libzmq_werror=\"yes\"/libzmq_werror=\"no\"/g" \
     configure
 
 
 %build
-%configure --disable-static
+%configure \
+%if %{with pgm}
+            --with-system-pgm \
+%endif
+            --disable-static
 make %{?_smp_mflags}
 
 
@@ -91,6 +105,11 @@ make check
 
 
 %changelog
+* Fri Dec 14 2012 Thomas Spura <tomspur at fedoraproject.org> - 3.2.2-2
+- add bcond_with pgm macro (Jose Pedro Oliveira, #867182)
+- remove bundled pgm
+- add zeromq-3 git repository
+
 * Tue Nov 27 2012 Andrew Niemantsverdriet <andrewniemants at gmail.com - 3.2.2-1
 - update to 3.2.2
 


More information about the scm-commits mailing list