diff --git a/.gitignore b/.gitignore index a6107b7..da6f2bb 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ clog /mongo-c-driver-1.16.1.tar.gz /mongo-c-driver-1.16.2.tar.gz /mongo-c-driver-1.17.0-beta.tar.gz +/mongo-c-driver-1.17.0-beta2.tar.gz diff --git a/600.patch b/600.patch deleted file mode 100644 index e9661bf..0000000 --- a/600.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d983452a22ce867748cda2434b54a464891a4e20 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 15 Apr 2020 10:58:40 +0200 -Subject: [PATCH] Fix MATCHES usage so ENABLE_STATIC=BUILD_ONLY works - ---- - CMakeLists.txt | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9705540a8..cede9636c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -152,7 +152,7 @@ if (NOT ENABLE_BSON MATCHES "ON|AUTO|SYSTEM") - message (FATAL_ERROR "ENABLE_BSON option must be ON, AUTO, or SYSTEM") - endif () - --if (NOT ENABLE_STATIC MATCHES "ON|OFF|AUTO|BUILD_ONLY|DONT_INSTALL") -+if (NOT ENABLE_STATIC MATCHES "^(ON|OFF|AUTO|BUILD_ONLY|DONT_INSTALL)$") - message (FATAL_ERROR - "ENABLE_STATIC option must be ON, OFF, AUTO, BUILD_ONLY, or DONT_INSTALL" - ) -@@ -161,11 +161,15 @@ endif () - set (MONGOC_ENABLE_STATIC_BUILD 0) - set (MONGOC_ENABLE_STATIC_INSTALL 0) - --if (ENABLE_STATIC MATCHES "ON|AUTO") -+if (ENABLE_STATIC MATCHES "^(ON|AUTO)$") -+ message (STATUS "Build and install static libraries") - set (MONGOC_ENABLE_STATIC_BUILD 1) - set (MONGOC_ENABLE_STATIC_INSTALL 1) --elseif (ENABLE_STATIC MATCHES "BUILD_ONLY|DONT_INSTALL") -+elseif (ENABLE_STATIC MATCHES "^(BUILD_ONLY|DONT_INSTALL)$") -+ message (STATUS "Build only static libraries") - set (MONGOC_ENABLE_STATIC_BUILD 1) -+else () -+ message (STATUS "Don't build static libraries") - endif() - - if (ENABLE_BSON STREQUAL SYSTEM) diff --git a/mongo-c-driver.spec b/mongo-c-driver.spec index 445c044..1b05356 100644 --- a/mongo-c-driver.spec +++ b/mongo-c-driver.spec @@ -11,22 +11,20 @@ %global libname libmongoc %global libver 1.0 %global up_version 1.17.0 -%global up_prever beta +%global up_prever beta2 # disabled as require a MongoDB server %global with_tests 0%{?_with_tests:1} Name: mongo-c-driver Summary: Client library written in C for MongoDB Version: %{up_version}%{?up_prever:~%{up_prever}} -Release: 2%{?dist} +Release: 1%{?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/%{up_version}%{?up_prever:-%{up_prever}}/%{gh_project}-%{up_version}%{?up_prever:-%{up_prever}}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/mongodb/mongo-c-driver/pull/600.patch - BuildRequires: cmake >= 3.1 BuildRequires: gcc # pkg-config may pull compat-openssl10 @@ -107,7 +105,6 @@ Documentation: http://mongoc.org/libbson/%{version}/ %prep %setup -q -n %{gh_project}-%{up_version}%{?up_prever:-%{up_prever}} -%patch0 -p1 -b .pr600 %build @@ -218,6 +215,10 @@ exit $ret %changelog +* Wed Jun 10 2020 Remi Collet - 1.17.0~beta2-1 +- update to 1.17.0-beta2 +- drop patch merged upstream + * Fri May 15 2020 Pete Walter - 1.17.0~beta-2 - Rebuild for ICU 67 diff --git a/sources b/sources index 42feced..1feb7d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mongo-c-driver-1.17.0-beta.tar.gz) = ba2e7048eb68a1cef5323e06108899becc7adfff414674ea27f53ae8d2ef2c842824850d5a7ac51538cfd0334cb4ea557fe920453492c5dec9b3de5204035afd +SHA512 (mongo-c-driver-1.17.0-beta2.tar.gz) = 08093d6a7d57c2c25514e54c7a30bc045483bec043e85ea7c49aa323cd8116211be99743ac703580d80b4399c309bc1fbd68bc0a3d89ef5b8cd309d3a11d90c1