diff options
Diffstat (limited to 'libcouchbase.spec')
| -rw-r--r-- | libcouchbase.spec | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/libcouchbase.spec b/libcouchbase.spec index ad78589..c952cfd 100644 --- a/libcouchbase.spec +++ b/libcouchbase.spec @@ -14,8 +14,7 @@ %global with_tests 0%{?_with_tests:1} %endif -# Dtrace breaks parallel build - not enabled in Fedora package -%global with_dtrace 0 +%global with_dtrace 1 %if 0%{?fedora} >= 22 || 0%{?rhel} >= 7 %global with_uv 1 @@ -23,12 +22,8 @@ %global with_uv 0 %endif -# Notices: -# snappy supported but not enabled by default (upstream) -# hdrhistrogram suppoort seems broken, so not enabled - Name: libcouchbase -Version: 2.8.4 +Version: 2.8.5 Release: 1%{?dist} Summary: Couchbase client library Group: System Environment/Libraries @@ -39,12 +34,9 @@ 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: gcc +BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: cmake >= 2.8.9 @@ -55,11 +47,7 @@ BuildRequires: pkgconfig(libuv) >= 1 %endif %if %{with_dtrace} BuildRequires: systemtap-sdt-devel >= 1.8 -%endif -%if 0%{?fedora} >= 26 -BuildRequires: pkgconfig(snappy) >= 1.1 -%else -BuildRequires: snappy-devel >= 1.1 +BuildRequires: systemtap-devel %endif %if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 @@ -141,7 +129,6 @@ a Couchbase Server. %patch0 -p1 -b .crypto %patch1 -p1 -b .plug %patch2 -p1 -b .pkgc -%patch3 -p1 -b .snap %build @@ -158,8 +145,7 @@ a Couchbase Server. %else -DLCB_BUILD_DTRACE=OFF \ %endif - -DLCB_NO_MOCK=1 \ - -DLCB_NO_SNAPPY=0 + -DLCB_NO_MOCK=1 make %{?_smp_mflags} V=1 @@ -177,8 +163,10 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %endif -%post -p /sbin/ldconfig +%if 0%{?fedora} < 28 && 0%{?rhel} < 8 +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig +%endif %files @@ -186,6 +174,9 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %doc README.markdown RELEASE_NOTES.markdown %license LICENSE %{_libdir}/%{name}.so.2* +%if %{with_dtrace} +%{_datadir}/systemtap/tapset/libcouchbase.so* +%endif %files libevent %{_libdir}/%{name}/%{name}_libevent.so @@ -210,6 +201,9 @@ make %{_smp_mflags} alltests test ARGS=%{_smp_mflags} %changelog +* Fri Feb 23 2018 Sergey Avseyev <sergey.avseyev@gmail.com> - 2.8.5-1 +- Update to 2.8.5 + * Wed Dec 20 2017 Remi Collet <remi@remirepo.net> - 2.8.4-1 - Update to 2.8.4 - filter private plugins (not shared libraries) |