From 168f846196a780eb039b625324fb1723501d326c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Dec 2017 14:00:31 +0100 Subject: v2.8.4 from Fedora --- libcouchbase.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'libcouchbase.spec') diff --git a/libcouchbase.spec b/libcouchbase.spec index 3c8cc0d..333ed56 100644 --- a/libcouchbase.spec +++ b/libcouchbase.spec @@ -28,8 +28,8 @@ # hdrhistrogram suppoort seems broken, so not enabled Name: libcouchbase -Version: 2.8.3 -Release: 2%{?dist} +Version: 2.8.4 +Release: 1%{?dist} Summary: Couchbase client library Group: System Environment/Libraries License: ASL 2.0 @@ -39,6 +39,11 @@ Source0: http://packages.couchbase.com/clients/c/%{name}-%{version}.tar.gz Patch0: 0001-enforce-system-crypto-policies.patch Patch1: 0002-do-not-install-plugins-into-libdir.patch Patch2: 0003-fix-pkgconfig-paths.patch +# snappy-devel 1.1.7 in Rawhide (28) does not provide version info +# in snappy-stubs-public.h, so we pull it from pkg-config +# https://bugzilla.redhat.com/show_bug.cgi?id=1527850 +# https://github.com/couchbase/libcouchbase/commit/371502c8e516b466cef5e98567e71572b7093d96 +Patch3: 0004-detect-snappy-version-for-cbc-version.patch BuildRequires: libtool BuildRequires: openssl-devel @@ -51,6 +56,7 @@ BuildRequires: pkgconfig(libuv) >= 1 %if %{with_dtrace} BuildRequires: systemtap-sdt-devel >= 1.8 %endif +BuildRequires: pkgconfig(snappy) >= 1.1 %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Recommends: %{name}-libevent%{_isa} = %{version}-%{release} @@ -127,6 +133,7 @@ a Couchbase Server. %patch0 -p1 -b .crypto %patch1 -p1 -b .plug %patch2 -p1 -b .pkgc +%patch3 -p1 -b .snap %build @@ -143,7 +150,8 @@ a Couchbase Server. %else -DLCB_BUILD_DTRACE=OFF \ %endif - -DLCB_NO_MOCK=1 + -DLCB_NO_MOCK=1 \ + -DLCB_NO_SNAPPY=0 make %{?_smp_mflags} V=1 @@ -194,6 +202,9 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %changelog +* Wed Dec 20 2017 Sergey Avseyev - 2.8.4-1 +- Update to 2.8.4 + * Wed Nov 22 2017 Sergey Avseyev - 2.8.3-2 - Parallel tests -- cgit