diff --git a/.gitignore b/.gitignore index 2b44da4..3bd299a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /mongo-c-driver-1.3.5.tar.gz /mongo-c-driver-1.5.0-rc2.tar.gz /mongo-c-driver-missing.tgz +/mongo-c-driver-1.5.0-rc3.tar.gz diff --git a/mongo-c-driver-pr401.patch b/mongo-c-driver-pr401.patch deleted file mode 100644 index 34c9e54..0000000 --- a/mongo-c-driver-pr401.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a021ada41374b9be9b478252d53a2a199bfdbf7b Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 14 Oct 2016 09:42:13 +0200 -Subject: [PATCH] CDRIVER-1702 don't fail when returned platform is truncated - ---- - tests/test-mongoc-handshake.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/test-mongoc-handshake.c b/tests/test-mongoc-handshake.c -index b806b59..604cbf8 100644 ---- a/tests/test-mongoc-handshake.c -+++ b/tests/test-mongoc-handshake.c -@@ -257,7 +257,9 @@ test_mongoc_handshake_data_append_success (void) - ASSERT (BSON_ITER_HOLDS_UTF8 (&md_iter)); - val = bson_iter_utf8 (&md_iter, NULL); - ASSERT (val); -- ASSERT (strstr (val, platform) != NULL); -+ if (strlen(val) < 250) { /* standard val are < 100, may be truncated on some platform */ -+ ASSERT (strstr (val, platform) != NULL); -+ } - - mock_server_replies_simple (request, - "{'ok': 1, 'ismaster': true}"); diff --git a/mongo-c-driver.spec b/mongo-c-driver.spec index 0cfb2f2..980576d 100644 --- a/mongo-c-driver.spec +++ b/mongo-c-driver.spec @@ -10,7 +10,7 @@ %global gh_project mongo-c-driver %global libname libmongoc %global libver 1.0 -%global prever rc2 +%global prever rc3 %global bsonver 1.5 %ifarch x86_64 @@ -25,20 +25,13 @@ Name: mongo-c-driver Summary: Client library written in C for MongoDB Version: 1.5.0 -Release: 0.2.%{prever}%{?dist} +Release: 0.3.%{prever}%{?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://jira.mongodb.org/browse/CDRIVER-1703 -Source1: mongo-c-driver-missing.tgz - -# https://jira.mongodb.org/browse/CDRIVER-1702 -# https://github.com/mongodb/mongo-c-driver/pull/401 -Patch0: mongo-c-driver-pr401.patch - BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(libbson-1.0) > %{bsonver} %if 0%{?fedora} > 21 || 0%{?rhel} > 6 @@ -89,9 +82,6 @@ Documentation: http://api.mongodb.org/c/%{version}/ %prep %setup -q -n %{gh_project}-%{version}%{?prever:-%{prever}} -tar xf %{SOURCE1} -%patch0 -p1 -b .pr401 - rm -r src/libbson # Ignore check for libbson version = libmongoc version @@ -174,6 +164,10 @@ exit $ret %changelog +* Thu Oct 20 2016 Remi Collet - 1.5.0-0.3.rc3 +- update to 1.5.0-rc3 +- drop patches merged upstream + * Fri Oct 14 2016 Remi Collet - 1.5.0-0.2.rc2 - open https://jira.mongodb.org/browse/CDRIVER-1703 missing files - open https://jira.mongodb.org/browse/CDRIVER-1702 broken test diff --git a/sources b/sources index a1f07eb..e64f104 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -5adb8489e2d6910ca7948e015e5529b3 mongo-c-driver-1.5.0-rc2.tar.gz -fb218dd18b7339dcb56200e272a2fc97 mongo-c-driver-missing.tgz +0e20f88771d53892c0a0d104b75d2f81 mongo-c-driver-1.5.0-rc3.tar.gz