diff options
| -rw-r--r-- | mongo-c-driver-api.patch | 48 | ||||
| -rw-r--r-- | mongo-c-driver-dev.spec | 20 |
2 files changed, 8 insertions, 60 deletions
diff --git a/mongo-c-driver-api.patch b/mongo-c-driver-api.patch deleted file mode 100644 index 067244f..0000000 --- a/mongo-c-driver-api.patch +++ /dev/null @@ -1,48 +0,0 @@ -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 ad3cf74..c42519d 100644 --- a/mongo-c-driver-dev.spec +++ b/mongo-c-driver-dev.spec @@ -10,7 +10,7 @@ %global gh_project mongo-c-driver %global libname libmongoc %global libver 1.0 -%global prever beta1 +#global prever beta1 %global bsonver 1.4 %ifarch x86_64 @@ -26,16 +26,13 @@ Name: mongo-c-driver Summary: Client library written in C for MongoDB Version: 1.4.0 -Release: 0.1.%{prever}%{?dist} +Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Libraries 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 @@ -85,7 +82,6 @@ Documentation: http://api.mongodb.org/c/%{version}/ %prep %setup -q -n %{gh_project}-%{version}%{?prever:-%{prever}} -%patch0 -p1 -b .api rm -r src/libbson @@ -93,12 +89,6 @@ rm -r src/libbson sed -e 's/libbson-1.0 >= \$MONGOC_RELEASED_VERSION/libbson-1.0 >= %{bsonver}/' \ -i configure -# Temporary for https://jira.mongodb.org/browse/CDRIVER-1457 -sed -e '/mongoc_client_pool_set_appname/d' \ - -e '/mongoc_client_set_appname/d' \ - -e '/mongoc_metadata_append/d' \ - -i src/libmongoc.symbols - %build export LIBS=-lpthread @@ -178,10 +168,16 @@ make -C tests abicheck %changelog +* Thu Aug 11 2016 Remi Collet <remi@fedoraproject.org> - 1.4.0-1 +- update to 1.4.0 +- drop API patch merged upstream + * Mon Aug 8 2016 Remi Collet <remi@fedoraproject.org> - 1.4.0-0.1.beta1 - update to 1.4.0-beta1 - build with --enable-system-crypto-profile option - open https://jira.mongodb.org/browse/CDRIVER-1457 (symbols) +- open https://github.com/mongodb/mongo-c-driver/pull/385 +- drop crypto patch merged upstream * Mon May 16 2016 Remi Collet <remi@fedoraproject.org> - 1.3.5-2 - add patch to enforce system crypto policies |