From caa53cf4c739567639a288993b1bea16e592407cfe9147c45904c7c50f0b92de Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 29 May 2018 07:05:25 +0000 Subject: [PATCH] Accepting request 612703 from home:avindra:branches:devel:tools - Update to version 1.4.1 * Realign expectation that State::iterations() returns 0 before the main benchmark loop begins. * CMake error message fixes * Enscripten check fix * Bazel pthread linking * Negative regexes * gmock fix OBS-URL: https://build.opensuse.org/request/show/612703 OBS-URL: https://build.opensuse.org/package/show/devel:tools/benchmark?expand=0&rev=18 --- benchmark-1.4.0.tar.gz | 3 --- benchmark-1.4.1.tar.gz | 3 +++ benchmark.changes | 12 ++++++++++++ benchmark.spec | 16 ++++++++++------ 4 files changed, 25 insertions(+), 9 deletions(-) delete mode 100644 benchmark-1.4.0.tar.gz create mode 100644 benchmark-1.4.1.tar.gz diff --git a/benchmark-1.4.0.tar.gz b/benchmark-1.4.0.tar.gz deleted file mode 100644 index 0449a1f..0000000 --- a/benchmark-1.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:616f252f37d61b15037e3c2ef956905baf9c9eecfeab400cb3ad25bae714e214 -size 125274 diff --git a/benchmark-1.4.1.tar.gz b/benchmark-1.4.1.tar.gz new file mode 100644 index 0000000..d9d214e --- /dev/null +++ b/benchmark-1.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8e525db3c42efc9c7f3bc5176a8fa893a9a9920bbd08cef30fb56a51854d60d +size 126850 diff --git a/benchmark.changes b/benchmark.changes index 50ae945..7c42fa6 100644 --- a/benchmark.changes +++ b/benchmark.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon May 28 21:43:24 UTC 2018 - avindra@opensuse.org + +- Update to version 1.4.1 + * Realign expectation that State::iterations() returns 0 before + the main benchmark loop begins. + * CMake error message fixes + * Enscripten check fix + * Bazel pthread linking + * Negative regexes + * gmock fix + ------------------------------------------------------------------- Wed Apr 4 22:20:14 UTC 2018 - avindra@opensuse.org diff --git a/benchmark.spec b/benchmark.spec index efb3587..248067a 100644 --- a/benchmark.spec +++ b/benchmark.spec @@ -19,12 +19,12 @@ %define soname lib%{name} %define sover 0 Name: benchmark -Version: 1.4.0 +Version: 1.4.1 Release: 0 Summary: A microbenchmark support library License: Apache-2.0 Group: Development/Libraries/C and C++ -Url: https://github.com/google/benchmark +URL: https://github.com/google/benchmark Source: https://github.com/google/benchmark/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: gcc-c++ @@ -64,6 +64,8 @@ sed -i 's|lib_install_dir "lib/"|lib_install_dir "lib64/"|g' src/CMakeLists.txt %install %cmake_install +# dont ship debug stuff +rm -rf %{_libexecdir}/debug %check # path needs to be exported otherwise unit tests will fail @@ -77,15 +79,17 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/build/sr %license LICENSE %doc README.md AUTHORS %{_libdir}/%{soname}.so.%{sover}* +%{_libdir}/%{soname}_main.so.%{sover}* %files devel %license LICENSE %doc README.md AUTHORS -%dir %{_prefix}/lib/cmake/ -%dir %{_prefix}/lib/cmake/%{name} -%{_prefix}/lib/cmake/%{name}/*.cmake -%{_prefix}/lib/pkgconfig/%{name}.pc +%dir %{_libexecdir}/cmake/ +%dir %{_libexecdir}/cmake/%{name} +%{_libexecdir}/cmake/%{name}/*.cmake +%{_libexecdir}/pkgconfig/%{name}.pc %{_libdir}/%{soname}.so +%{_libdir}/%{soname}_main.so %{_includedir}/%{name} %changelog