From 478cf868114ca2a3f799946f1b5c6f2eafb04b32 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Dec 2020 12:13:48 +0100 Subject: update to 3.0.7 drop patch merged upstream --- libcouchbase.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'libcouchbase.spec') diff --git a/libcouchbase.spec b/libcouchbase.spec index b58c1c3..dd23beb 100644 --- a/libcouchbase.spec +++ b/libcouchbase.spec @@ -31,8 +31,8 @@ Name: %{libname}%{soname} %else Name: %{libname} %endif -Version: 3.0.6 -Release: 2%{?dist} +Version: 3.0.7 +Release: 1%{?dist} Summary: Couchbase client library Group: System Environment/Libraries License: ASL 2.0 @@ -40,18 +40,18 @@ URL: http://www.couchbase.com/communities/c/getting-started Source0: http://packages.couchbase.com/clients/c/%{libname}-%{version}.tar.gz Patch0: %{libname}-0001-enforce-system-crypto-policies.patch -Patch1: %{libname}-0002-add-LCB_PLUGINS_DIR-option-to-set-directory-for-IO-p.patch %if 0%{?rhel} == 7 %global dtsenable source /opt/rh/devtoolset-8/enable BuildRequires: devtoolset-8-toolchain +BuildRequires: cmake3 >= 3.5.1 %else BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: cmake >= 3.5.1 %endif BuildRequires: libtool BuildRequires: openssl-devel -BuildRequires: cmake >= 2.8.9 BuildRequires: pkgconfig(libevent) >= 2.0.20 BuildRequires: libev-devel >= 3 %if %{with uv} @@ -166,14 +166,17 @@ a Couchbase Server. %prep %setup -q -n %{libname}-%{version} %patch0 -p1 -b .crypto -%patch1 -p1 -b .plugdir %build %{?dtsenable} gcc --version +%if 0%{?rhel} == 7 +%cmake3 \ +%else %cmake \ +%endif -DLCB_BUILD_LIBEVENT=ON \ -DLCB_BUILD_LIBEV=ON \ %if %{with uv} @@ -250,6 +253,10 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %changelog +* Wed Dec 16 2020 Remi Collet - 3.0.7-1 +- update to 3.0.7 +- drop patch merged upstream + * Mon Nov 16 2020 Remi Collet - 3.0.6-2 - cleanup and only rename for fedora < 34 -- cgit