From eb998c2c98b01451763743d250fd7cdb05c9351a573cc0a64b00030535fd69dd Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Sat, 17 Mar 2018 08:57:15 +0000
Subject: [PATCH] Accepting request 587996 from home:avindra

- Update to version 1.3.0:
 * Ranged for loop optimization!
 * Make installation optional
 * Better stats including user-provided ones
 * JSON reporter format fixes
 * Documentation improvements
- Includes changes from 1.2.0:
 * User-defined counters
 * Single header library
 * Ability to clear benchmarks so the runtime registration is more flexible
 * Sample-based standard deviation
 * 32-bit build enabled
 * Bug fixes
- Cleanup with spec-cleaner
- Use %ctest macro for testing

OBS-URL: https://build.opensuse.org/request/show/587996
OBS-URL: https://build.opensuse.org/package/show/devel:tools/benchmark?expand=0&rev=12
---
 benchmark-1.1.0.tar.gz |  3 ---
 benchmark-1.3.0.tar.gz |  3 +++
 benchmark.changes      | 19 +++++++++++++++++++
 benchmark.spec         | 25 ++++++++++++++-----------
 4 files changed, 36 insertions(+), 14 deletions(-)
 delete mode 100644 benchmark-1.1.0.tar.gz
 create mode 100644 benchmark-1.3.0.tar.gz

diff --git a/benchmark-1.1.0.tar.gz b/benchmark-1.1.0.tar.gz
deleted file mode 100644
index f531579..0000000
--- a/benchmark-1.1.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7334dd254434c6668e33a54c8f839194c7c61840d52f4b6258eee28e9f3b20e
-size 87199
diff --git a/benchmark-1.3.0.tar.gz b/benchmark-1.3.0.tar.gz
new file mode 100644
index 0000000..0704731
--- /dev/null
+++ b/benchmark-1.3.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f19559475a592cbd5ac48b61f6b9cedf87f0b6775d1443de54cfe8f53940b28d
+size 105485
diff --git a/benchmark.changes b/benchmark.changes
index 5df1a6e..6e6f025 100644
--- a/benchmark.changes
+++ b/benchmark.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Fri Mar 16 18:38:52 UTC 2018 - avindra@opensuse.org
+
+- Update to version 1.3.0:
+ * Ranged for loop optimization!
+ * Make installation optional
+ * Better stats including user-provided ones
+ * JSON reporter format fixes
+ * Documentation improvements
+- Includes changes from 1.2.0:
+ * User-defined counters
+ * Single header library
+ * Ability to clear benchmarks so the runtime registration is more flexible
+ * Sample-based standard deviation
+ * 32-bit build enabled
+ * Bug fixes
+- Cleanup with spec-cleaner
+- Use %ctest macro for testing
+
 -------------------------------------------------------------------
 Fri Jan 27 14:46:11 UTC 2017 - mpluskal@suse.com
 
diff --git a/benchmark.spec b/benchmark.spec
index 1a6f90c..240e845 100644
--- a/benchmark.spec
+++ b/benchmark.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package benchmark
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %define soname  lib%{name}
 %define sover   0
 Name:           benchmark
-Version:        1.1.0
+Version:        1.3.0
 Release:        0
 Summary:        A microbenchmark support library
 License:        Apache-2.0
@@ -27,11 +27,11 @@ 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
+Patch0:         benchmark-s390.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  git-core
-ExclusiveArch:  %ix86 x86_64 s390x
+ExclusiveArch:  %{ix86} x86_64 s390x
 
 %description
 A library to support the benchmarking of functions, similar to unit-tests.
@@ -53,11 +53,11 @@ Development files for google benchmark library
 
 %prep
 %setup -q
-%patch 
+%patch0
 
 %build
 %if %{__isa_bits} == 64
-sed -i "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION lib64|g" src/CMakeLists.txt
+sed -i 's|lib_install_dir "lib/"|lib_install_dir "lib64/"|g' src/CMakeLists.txt
 %endif
 %cmake \
   -DBENCHMARK_ENABLE_LTO=off \
@@ -70,19 +70,22 @@ sed -i "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION lib64|g" src/CMakeLists.tx
 %check
 # path needs to be exported otherwise unit tests will fail
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/build/src/
-make -C build test
+%ctest
 
 %post -n %{soname}%{sover} -p /sbin/ldconfig
 %postun -n %{soname}%{sover} -p /sbin/ldconfig
 
 %files -n %{soname}%{sover}
-%defattr(-,root,root)
-%doc LICENSE README.md AUTHORS
+%license LICENSE
+%doc README.md AUTHORS
 %{_libdir}/%{soname}.so.%{sover}*
 
 %files devel
-%defattr(-,root,root)
-%doc LICENSE README.md AUTHORS
+%license LICENSE
+%doc README.md AUTHORS
+%dir %{_prefix}/lib/cmake/
+%dir %{_prefix}/lib/cmake/benchmark
+%{_prefix}/lib/cmake/benchmark/*.cmake
 %{_libdir}/%{soname}.so
 %{_includedir}/%{name}