From b649a017a57b5a4df542a402f2352536f405dcb1e93b3f95156d34d026a6b071 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 18 Feb 2019 10:56:07 +0000 Subject: [PATCH] Accepting request 677002 from home:alois:branches:devel:tools - Use arch-specific directories for support files OBS-URL: https://build.opensuse.org/request/show/677002 OBS-URL: https://build.opensuse.org/package/show/devel:tools/benchmark?expand=0&rev=22 --- benchmark.changes | 5 +++++ benchmark.spec | 18 +++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/benchmark.changes b/benchmark.changes index 046323a..dbb6cf2 100644 --- a/benchmark.changes +++ b/benchmark.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 18 09:52:40 UTC 2019 - Luigi Baldoni + +- Use arch-specific directories for support files + ------------------------------------------------------------------- Mon Jun 25 11:56:55 UTC 2018 - mpluskal@suse.com diff --git a/benchmark.spec b/benchmark.spec index 4c55a04..e350cbd 100644 --- a/benchmark.spec +++ b/benchmark.spec @@ -1,7 +1,7 @@ # # spec file for package benchmark # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -55,9 +55,10 @@ Development files for google benchmark library %setup -q %build -%if %{__isa_bits} == 64 -sed -i 's|lib_install_dir "lib/"|lib_install_dir "lib64/"|g' src/CMakeLists.txt -%endif +sed -e 's|lib_install_dir "lib/"|lib_install_dir "%{_libdir}/"|g' \ + -e 's|config_install_dir "lib/cmake|config_install_dir "%{_libdir}/cmake|g' \ + -e 's|pkgconfig_install_dir "lib/pkgconfig"|pkgconfig_install_dir "%{_libdir}/pkgconfig"|g' \ + -i src/CMakeLists.txt %cmake \ -DBENCHMARK_ENABLE_LTO=on \ -DBENCHMARK_ENABLE_TESTING=true @@ -85,10 +86,9 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/build/sr %files devel %license LICENSE %doc README.md AUTHORS -%dir %{_libexecdir}/cmake/ -%dir %{_libexecdir}/cmake/%{name} -%{_libexecdir}/cmake/%{name}/*.cmake -%{_libexecdir}/pkgconfig/%{name}.pc +%dir %{_libdir}/cmake/%{name} +%{_libdir}/cmake/%{name}/*.cmake +%{_libdir}/pkgconfig/%{name}.pc %{_libdir}/%{soname}.so %{_libdir}/%{soname}_main.so %{_includedir}/%{name}