From 1f3e0f6fe6a6416648bf4737279a3ab72842bc415bcbff9ea312d4f0ae4b94f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 30 Sep 2024 10:42:37 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main leveldb revision 9b93d939a945a25736627a2c4358f9c5 --- leveldb.changes | 11 +++++++++++ leveldb.spec | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/leveldb.changes b/leveldb.changes index 3933411..440a5f0 100644 --- a/leveldb.changes +++ b/leveldb.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Mar 25 05:43:50 UTC 2024 - David Disseldorp + +- Use C++14 to satisfy GTest's new minimum version requirement + [bsc#1221870] + +------------------------------------------------------------------- +Mon Jan 22 09:31:24 UTC 2024 - pgajdos@suse.com + +- remove faulty and noop assignment + ------------------------------------------------------------------- Thu Jan 11 18:08:20 UTC 2024 - pgajdos@suse.com diff --git a/leveldb.spec b/leveldb.spec index 146de30..cca091d 100644 --- a/leveldb.spec +++ b/leveldb.spec @@ -80,11 +80,11 @@ This package holds the development files for statically linking leveldb. %build # unfortunately a two-pass build is needed for shared and static libs %global _lto_cflags %{_lto_cflags} -ffat-lto-objects -%cmake -DBUILD_SHARED_LIBS=ON +%cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_STANDARD=14 %cmake_build cd .. %define __builddir build_static -%cmake -DBUILD_SHARED_LIBS=OFF +%cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_STANDARD=14 %cmake_build %install @@ -103,7 +103,6 @@ cp -a build_static/db_bench %{buildroot}%{_bindir} # bsc#1218597 exclude_regex='--exclude-regex autocompact_test' %endif -eclude_regex='--exclude-regex "(autocompact_test|db_test)"' %ctest $exclude_regex %post -n %{lib_name} -p /sbin/ldconfig