From 6154138a14e25786f2e0114dc8464b7e921eee2e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Oct 14 2016 09:30:13 +0000 Subject: - open https://jira.mongodb.org/browse/CDRIVER-1703 missing files - open https://jira.mongodb.org/browse/CDRIVER-1702 broken test - enable test suite --- diff --git a/.gitignore b/.gitignore index eb2efbc..2b44da4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +clog /mongo-c-driver-1.3.5.tar.gz /mongo-c-driver-1.5.0-rc2.tar.gz +/mongo-c-driver-missing.tgz diff --git a/mongo-c-driver-pr401.patch b/mongo-c-driver-pr401.patch new file mode 100644 index 0000000..34c9e54 --- /dev/null +++ b/mongo-c-driver-pr401.patch @@ -0,0 +1,24 @@ +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 4ee0e57..0cfb2f2 100644 --- a/mongo-c-driver.spec +++ b/mongo-c-driver.spec @@ -21,18 +21,24 @@ # 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 Version: 1.5.0 -Release: 0.1.%{prever}%{?dist} +Release: 0.2.%{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 @@ -83,6 +89,9 @@ 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 @@ -165,6 +174,11 @@ exit $ret %changelog +* 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 +- enable test suite + * Fri Oct 14 2016 Remi Collet - 1.5.0-0.1.rc2 - update to 1.5.0-rc2 - drop crypto patch merged upstream diff --git a/sources b/sources index 24cdb96..a1f07eb 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 5adb8489e2d6910ca7948e015e5529b3 mongo-c-driver-1.5.0-rc2.tar.gz +fb218dd18b7339dcb56200e272a2fc97 mongo-c-driver-missing.tgz