diff --git a/benchmark-1.0.0.tar.gz b/benchmark-1.0.0.tar.gz deleted file mode 100644 index cbd03d8..0000000 --- a/benchmark-1.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2206c263fc1a7803d4b10e164e0c225f6bcf0d5e5f20b87929f137dee247b54 -size 58944 diff --git a/benchmark-1.1.0.tar.gz b/benchmark-1.1.0.tar.gz new file mode 100644 index 0000000..f531579 --- /dev/null +++ b/benchmark-1.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7334dd254434c6668e33a54c8f839194c7c61840d52f4b6258eee28e9f3b20e +size 87199 diff --git a/benchmark-s390.patch b/benchmark-s390.patch index 3334330..c0cbda2 100644 --- a/benchmark-s390.patch +++ b/benchmark-s390.patch @@ -1,8 +1,8 @@ -Index: benchmark-1.0.0/src/cycleclock.h +Index: src/cycleclock.h =================================================================== ---- benchmark-1.0.0.orig/src/cycleclock.h -+++ benchmark-1.0.0/src/cycleclock.h -@@ -124,6 +124,11 @@ inline BENCHMARK_ALWAYS_INLINE int64_t N +--- src/cycleclock.h.orig ++++ src/cycleclock.h +@@ -132,6 +132,11 @@ inline BENCHMARK_ALWAYS_INLINE int64_t N struct timeval tv; gettimeofday(&tv, nullptr); return static_cast(tv.tv_sec) * 1000000 + tv.tv_usec; diff --git a/benchmark.changes b/benchmark.changes index ecc5147..1ed88ec 100644 --- a/benchmark.changes +++ b/benchmark.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jan 27 14:46:11 UTC 2017 - mpluskal@suse.com + +- Update to version 1.1.0: + * ArgNames support + * Fixes for OSX and Cygwin and MSVC builds + * PauseTiming and ResumeTiming are per thread (#286) + * Better Range and Arg specifications + * Complexity reporting + ------------------------------------------------------------------- Fri Jan 27 14:28:26 UTC 2017 - bg@suse.com diff --git a/benchmark.spec b/benchmark.spec index 7962504..1a6f90c 100644 --- a/benchmark.spec +++ b/benchmark.spec @@ -19,18 +19,18 @@ %define soname lib%{name} %define sover 0 Name: benchmark -Version: 1.0.0 +Version: 1.1.0 Release: 0 Summary: A microbenchmark support library License: Apache-2.0 Group: Development/Libraries/C and C++ Url: https://github.com/google/benchmark Source: https://github.com/google/benchmark/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FEATURE-UPSTREAM benchmark-s390.patch Patch: benchmark-s390.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: git-core -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 s390x %description @@ -53,7 +53,7 @@ Development files for google benchmark library %prep %setup -q -%patch -p1 +%patch %build %if %{__isa_bits} == 64 @@ -61,9 +61,8 @@ sed -i "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION lib64|g" src/CMakeLists.tx %endif %cmake \ -DBENCHMARK_ENABLE_LTO=off \ - -DBENCHMARK_ENABLE_TESTING=true \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo -make %{?_smp_mflags} + -DBENCHMARK_ENABLE_TESTING=true +%make_jobs %install %cmake_install