[packages/mongo-c-driver] add sasl bcond

glen glen at pld-linux.org
Sun Oct 29 21:24:14 CET 2017


commit 6ce258cc1c8d22967f6623b83f6df2655e96cb84
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sun Oct 29 22:09:25 2017 +0200

    add sasl bcond

 mongo-c-driver-rpm.patch | 4 ++--
 mongo-c-driver.spec      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/mongo-c-driver.spec b/mongo-c-driver.spec
index 98c014f..67e4665 100644
--- a/mongo-c-driver.spec
+++ b/mongo-c-driver.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_with	tests		# build with tests
 %bcond_with	doc		# build docs
+%bcond_without	sasl		# Use libsasl for Kerberos.
 
 # NOTE about arch:
 # See https://jira.mongodb.org/browse/CDRIVER-1186
@@ -20,7 +21,7 @@ Patch0:		%{name}-rpm.patch
 URL:		https://github.com/mongodb/mongo-c-driver
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	cyrus-sasl-devel
+%{?with_sasl:BuildRequires:	cyrus-sasl-devel}
 BuildRequires:	libbson-devel >= 1.8
 BuildRequires:	libtool
 BuildRequires:	openssl-devel
@@ -82,7 +83,7 @@ export LIBS=-lpthread
 	--enable-crypto-system-profile \
 	%{__enable_disable doc man-pages} \
 	%{__enable_disable tests} \
-	--enable-sasl \
+	--enable-sasl=%{!?with_sasl:no}%{?with_sasl:yes} \
 	--enable-ssl \
 	--with-libbson=system \
 	--with-snappy=system \
diff --git a/mongo-c-driver-rpm.patch b/mongo-c-driver-rpm.patch
index 9bb0534..e5c7679 100644
--- a/mongo-c-driver-rpm.patch
+++ b/mongo-c-driver-rpm.patch
@@ -12,7 +12,7 @@ diff -up ./build/autotools/Libbson.m4.rpm ./build/autotools/Libbson.m4
  # greater than our required version.
  AS_IF([test "x${with_libbson}" = xauto],
 -      [PKG_CHECK_MODULES(BSON, [libbson-1.0 >= libbson_required_version],
-+      [PKG_CHECK_MODULES(BSON, [libbson-1.0 >= 1.6],
++      [PKG_CHECK_MODULES(BSON, [libbson-1.0 >= 1.8],
                           [with_libbson=system],
                           [with_libbson=bundled])])
  
@@ -20,7 +20,7 @@ diff -up ./build/autotools/Libbson.m4.rpm ./build/autotools/Libbson.m4
  AS_IF([test "x${with_libbson}" = xsystem],
        [PKG_CHECK_MODULES(BSON,
 -                         [libbson-1.0 >= libbson_required_version],
-+                         [libbson-1.0 >= 1.6],
++                         [libbson-1.0 >= 1.8],
                           [],
                           [AC_MSG_ERROR([
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mongo-c-driver.git/commitdiff/46f361300895546b6325bbb8934e4775111e37ef



More information about the pld-cvs-commit mailing list