diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-08-31 20:01:43 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-08-31 20:01:43 +0200 |
| commit | 1c2362338090bef1890675afca757e8deb45c11a (patch) | |
| tree | 1b6fde1c4577bae3d5421b26adc5265fc41dd592 | |
| parent | 70d20f0775ad0088599a1140320243abc7d3e82e (diff) | |
mongo-c-driver: more upstream patch (EL-6)
| -rw-r--r-- | mongo-c-driver-upstream.patch | 31 | ||||
| -rw-r--r-- | mongo-c-driver.spec | 9 |
2 files changed, 35 insertions, 5 deletions
diff --git a/mongo-c-driver-upstream.patch b/mongo-c-driver-upstream.patch index 421af38..bb8239c 100644 --- a/mongo-c-driver-upstream.patch +++ b/mongo-c-driver-upstream.patch @@ -20,3 +20,34 @@ index fa02960..49bf1cc 100644 # error "Only <mongoc.h> can be included directly." #endif +From d5de834e40e157b34a6a384c5856917eb1b56cdc Mon Sep 17 00:00:00 2001 +From: Hannes Magnusson <bjori@php.net> +Date: Mon, 31 Aug 2015 10:36:38 -0700 +Subject: [PATCH] CDRIVER-820: error: #pragma GCC diagnostic not allowed inside + functions + +And remove the unhelpful (debug) assert that cause two tickets so far +--- + src/mongoc/mongoc-matcher-op.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/src/mongoc/mongoc-matcher-op.c b/src/mongoc/mongoc-matcher-op.c +index f098ec6..77f66e2 100644 +--- a/src/mongoc/mongoc-matcher-op.c ++++ b/src/mongoc/mongoc-matcher-op.c +@@ -162,15 +162,6 @@ _mongoc_matcher_op_compare_new (mongoc_matcher_opcode_t opcode, /* IN */ + { + mongoc_matcher_op_t *op; + +-#if defined(__GNUC__) +-# pragma GCC diagnostic push +-# pragma GCC diagnostic ignored "-Wtype-limits" +-#endif +- BSON_ASSERT ((opcode >= MONGOC_MATCHER_OPCODE_EQ) && +- (opcode <= MONGOC_MATCHER_OPCODE_NIN)); +-#if defined(__GNUC__) +-# pragma GCC diagnostic pop +-#endif + BSON_ASSERT (path); + BSON_ASSERT (iter); + diff --git a/mongo-c-driver.spec b/mongo-c-driver.spec index 19f4d90..7afef64 100644 --- a/mongo-c-driver.spec +++ b/mongo-c-driver.spec @@ -29,7 +29,7 @@ Release: 0.1.%{gh_date}git%{gh_short}%{?dist} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz BuildRequires: libtool autoconf %else -Release: 0.2.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} Source0: https://github.com/%{gh_owner}/%{gh_project}/releases/download/%{version}%{?prever:-%{prever}}/%{gh_project}-%{version}%{?prever:-%{prever}}.tar.gz %endif License: ASL 2.0 @@ -92,10 +92,6 @@ autoreconf -fvi -I build/autotools %patch0 -p1 -b .upstream -%if 0%{?rhel} == 6 -sed -e '/GCC diagnostic/d' -i src/mongoc/mongoc-matcher-op.c -%endif - # Ensure we are using system library # Done after autoreconf because of m4_include rm -r src/libbson @@ -173,6 +169,9 @@ exit $ret %changelog +* Mon Aug 31 2015 Remi Collet <remi@fedoraproject.org> - 1.2.0-0.3.beta +- more upstream patch (for EL-6) + * Mon Aug 31 2015 Remi Collet <remi@fedoraproject.org> - 1.2.0-0.2.beta - Upstream version 1.2.0beta |