diff --git a/498.patch b/498.patch new file mode 100644 index 0000000..5c13ec7 --- /dev/null +++ b/498.patch @@ -0,0 +1,22 @@ +From 46f898f347336d78cc4e677d9aceba4ab719430c Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 28 May 2018 13:28:20 +0200 +Subject: [PATCH] CDRIVER-2667 include mongoc.h to have + MONGOC_ENABLE_SHM_COUNTERS + +--- + src/tools/mongoc-stat.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tools/mongoc-stat.c b/src/tools/mongoc-stat.c +index b5dab8d16..a8e7d5453 100644 +--- a/src/tools/mongoc-stat.c ++++ b/src/tools/mongoc-stat.c +@@ -16,6 +16,7 @@ + + + #include ++#include + + + #if defined(BSON_OS_UNIX) && defined(MONGOC_ENABLE_SHM_COUNTERS) diff --git a/mongo-c-driver.spec b/mongo-c-driver.spec index bb37c0e..7c01bac 100644 --- a/mongo-c-driver.spec +++ b/mongo-c-driver.spec @@ -25,13 +25,16 @@ Name: mongo-c-driver Summary: Client library written in C for MongoDB Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} # See THIRD_PARTY_NOTICES License: ASL 2.0 and ISC and MIT and zlib 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://jira.mongodb.org/browse/CDRIVER-2667 +Patch0: 498.patch + BuildRequires: cmake >= 3.1 BuildRequires: gcc # pkg-config may pull compat-openssl10 @@ -107,6 +110,7 @@ Documentation: http://mongoc.org/libbson/%{version}/ %prep %setup -q -n %{gh_project}-%{version}%{?prever:-dev} +%patch0 -p1 -b .2667 %build @@ -134,6 +138,7 @@ rm -rf %{buildroot}%{_libdir}/cmake/*static* rm -rf %{buildroot}%{_libdir}/pkgconfig/*static* # TODO investigate why not installed +# reported as https://jira.mongodb.org/browse/CDRIVER-2668 install -Dpm 755 src/libmongoc/mongoc-stat %{buildroot}%{_bindir}/mongoc-stat @@ -198,6 +203,13 @@ exit $ret %changelog +* Mon May 28 2018 Remi Collet - 1.10.0-2 +- add patch from https://github.com/mongodb/mongo-c-driver/pull/498 + for https://jira.mongodb.org/browse/CDRIVER-2667 + "mongoc-stat is not supported on your platform" +- open https://jira.mongodb.org/browse/CDRIVER-2668 + "mongoc-stat build but not installed" + * Mon May 28 2018 Remi Collet - 1.10.0-1 - update to 1.10.0 - also build libbson and create new sub-packages