summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-08-09 11:47:38 +0200
committerRemi Collet <fedora@famillecollet.com>2016-08-09 11:47:38 +0200
commit9ab0a573a9df9c36ddbd75183b03011ae98d0e8d (patch)
tree9cf767d283029bd890f2d146292087f238ec2401
parent7c3008b396433f6ac9bd8f7adbe22e520f24d9dc (diff)
mongo-c-driver: fix public API pfor pecl/mongodb
-rw-r--r--mongo-c-driver-api.patch48
-rw-r--r--mongo-c-driver-dev.spec7
2 files changed, 54 insertions, 1 deletions
diff --git a/mongo-c-driver-api.patch b/mongo-c-driver-api.patch
new file mode 100644
index 0000000..067244f
--- /dev/null
+++ b/mongo-c-driver-api.patch
@@ -0,0 +1,48 @@
+From 6162c5fd56a1febe1273beef38a3017c83f3c163 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Tue, 9 Aug 2016 11:26:14 +0200
+Subject: [PATCH] CDRIVER-1457 add missing in public API
+
+- mongoc_write_concern_is_acknowledged;
+- mongoc_write_concern_is_valid;
+- mongoc_write_concern_journal_is_set;
+
+Also related to https://jira.mongodb.org/browse/PHPC-762
+---
+ build/autotools/versions.ldscript | 3 +++
+ src/libmongoc.symbols | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/build/autotools/versions.ldscript b/build/autotools/versions.ldscript
+index 68da7c5..d3a68c1 100644
+--- a/build/autotools/versions.ldscript
++++ b/build/autotools/versions.ldscript
+@@ -368,4 +368,7 @@ LIBMONGOC_1.4 {
+ mongoc_uri_set_username;
+ mongoc_uri_set_write_concern;
+ mongoc_write_concern_append;
++ mongoc_write_concern_is_acknowledged;
++ mongoc_write_concern_is_valid;
++ mongoc_write_concern_journal_is_set;
+ } LIBMONGOC_1.3;
+diff --git a/src/libmongoc.symbols b/src/libmongoc.symbols
+index f7a5510..f555b1f 100644
+--- a/src/libmongoc.symbols
++++ b/src/libmongoc.symbols
+@@ -345,6 +345,8 @@ mongoc_write_concern_get_w
+ mongoc_write_concern_get_wmajority
+ mongoc_write_concern_get_wtag
+ mongoc_write_concern_get_wtimeout
++mongoc_write_concern_is_acknowledged
++mongoc_write_concern_is_valid
+ mongoc_write_concern_new
+ mongoc_write_concern_set_fsync
+ mongoc_write_concern_set_journal
+@@ -352,3 +354,4 @@ mongoc_write_concern_set_w
+ mongoc_write_concern_set_wmajority
+ mongoc_write_concern_set_wtag
+ mongoc_write_concern_set_wtimeout
++mongoc_write_concern_journal_is_set
+--
+2.5.5
+
diff --git a/mongo-c-driver-dev.spec b/mongo-c-driver-dev.spec
index 00df492..ad3cf74 100644
--- a/mongo-c-driver-dev.spec
+++ b/mongo-c-driver-dev.spec
@@ -21,6 +21,7 @@
# in MongoDB 3.2, and support is being removed in 3.4.
%global with_tests 0%{?_with_tests:1}
%endif
+%global with_tests 0
Name: mongo-c-driver
Summary: Client library written in C for MongoDB
@@ -32,6 +33,9 @@ URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: https://github.com/%{gh_owner}/%{gh_project}/releases/download/%{version}%{?prever:-%{prever}}/%{gh_project}-%{version}%{?prever:-%{prever}}.tar.gz
+# https://github.com/mongodb/mongo-c-driver/pull/385
+Patch0: %{name}-api.patch
+
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(libbson-1.0) > %{bsonver}
%if 0%{?fedora} > 21 || 0%{?rhel} > 6
@@ -81,6 +85,7 @@ Documentation: http://api.mongodb.org/c/%{version}/
%prep
%setup -q -n %{gh_project}-%{version}%{?prever:-%{prever}}
+%patch0 -p1 -b .api
rm -r src/libbson
@@ -148,7 +153,7 @@ make check || ret=1
exit $ret
%else
-: check disabled, missing '--with tests' option
+make -C tests abicheck
%endif