From ae8eea20f872a3bbd681b56136febbae00cce6ca2e6369f9d0fab21a4f3f142f Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 5 Apr 2018 07:58:10 +0000
Subject: [PATCH] Accepting request 593634 from
 home:avindra:branches:devel:tools

- Update to version 1.4.0
  * Removal of deprecated headers
  * Improved CPU cache info reporting
  * Support State::KeepRunningBatch()
  * Support int64_t for AddRange()
  * New platform support: NetBSD, s390x, Solaris
  * Bazel build support
  * Support googletest unit tests
  * Add assembler tests
  * Various warnings fixed
- Drop benchmark-s390.patch
  * fixed upstream (commit ff2c255af5bb2fc2e5cd3b3685f0c6283117ce73)

OBS-URL: https://build.opensuse.org/request/show/593634
OBS-URL: https://build.opensuse.org/package/show/devel:tools/benchmark?expand=0&rev=16
---
 benchmark-1.3.0.tar.gz |  3 ---
 benchmark-1.4.0.tar.gz |  3 +++
 benchmark-s390.patch   | 16 ----------------
 benchmark.changes      | 16 ++++++++++++++++
 benchmark.spec         | 12 ++++++------
 5 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 benchmark-1.3.0.tar.gz
 create mode 100644 benchmark-1.4.0.tar.gz
 delete mode 100644 benchmark-s390.patch

diff --git a/benchmark-1.3.0.tar.gz b/benchmark-1.3.0.tar.gz
deleted file mode 100644
index 0704731..0000000
--- a/benchmark-1.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f19559475a592cbd5ac48b61f6b9cedf87f0b6775d1443de54cfe8f53940b28d
-size 105485
diff --git a/benchmark-1.4.0.tar.gz b/benchmark-1.4.0.tar.gz
new file mode 100644
index 0000000..0449a1f
--- /dev/null
+++ b/benchmark-1.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:616f252f37d61b15037e3c2ef956905baf9c9eecfeab400cb3ad25bae714e214
+size 125274
diff --git a/benchmark-s390.patch b/benchmark-s390.patch
deleted file mode 100644
index c0cbda2..0000000
--- a/benchmark-s390.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/cycleclock.h
-===================================================================
---- 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<int64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
-+#elif defined(__s390__)
-+  // found this for papi package
-+  unsigned long long ret;
-+  __asm__("stck 0(%0)" : : "a" (&(ret)) : "memory", "cc");
-+  return (long long)ret;
- #else
- // The soft failover to a generic implementation is automatic only for ARM.
- // For other platforms the developer is expected to make an attempt to create
diff --git a/benchmark.changes b/benchmark.changes
index d1cd4c3..50ae945 100644
--- a/benchmark.changes
+++ b/benchmark.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Apr  4 22:20:14 UTC 2018 - avindra@opensuse.org
+
+- Update to version 1.4.0
+  * Removal of deprecated headers
+  * Improved CPU cache info reporting
+  * Support State::KeepRunningBatch()
+  * Support int64_t for AddRange()
+  * New platform support: NetBSD, s390x, Solaris
+  * Bazel build support
+  * Support googletest unit tests
+  * Add assembler tests
+  * Various warnings fixed
+- Drop benchmark-s390.patch
+  * fixed upstream (commit ff2c255af5bb2fc2e5cd3b3685f0c6283117ce73)
+
 -------------------------------------------------------------------
 Tue Mar 27 03:25:41 UTC 2018 - stefan.bruens@rwth-aachen.de
 
diff --git a/benchmark.spec b/benchmark.spec
index 2e8872a..efb3587 100644
--- a/benchmark.spec
+++ b/benchmark.spec
@@ -19,18 +19,18 @@
 %define soname  lib%{name}
 %define sover   0
 Name:           benchmark
-Version:        1.3.0
+Version:        1.4.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
-Patch0:         benchmark-s390.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  git-core
+BuildRequires:  gmock
+BuildRequires:  gtest
 
 %description
 A library to support the benchmarking of functions, similar to unit-tests.
@@ -52,7 +52,6 @@ Development files for google benchmark library
 
 %prep
 %setup -q
-%patch0
 
 %build
 %if %{__isa_bits} == 64
@@ -83,8 +82,9 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/build/sr
 %license LICENSE
 %doc README.md AUTHORS
 %dir %{_prefix}/lib/cmake/
-%dir %{_prefix}/lib/cmake/benchmark
-%{_prefix}/lib/cmake/benchmark/*.cmake
+%dir %{_prefix}/lib/cmake/%{name}
+%{_prefix}/lib/cmake/%{name}/*.cmake
+%{_prefix}/lib/pkgconfig/%{name}.pc
 %{_libdir}/%{soname}.so
 %{_includedir}/%{name}