From 2f2402adfdb29edaa5cd9638f085d256152e2393c2b6856f939bf7f55fa805c2 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 25 Jan 2024 07:34:43 +0000 Subject: [PATCH] Accepting request 1141280 from home:StefanBruens:branches:openSUSE:Factory - Fix build to cope with changes in (open)SUSE specific cmake macros, no user visible changes. OBS-URL: https://build.opensuse.org/request/show/1141280 OBS-URL: https://build.opensuse.org/package/show/devel:tools/benchmark?expand=0&rev=47 --- benchmark.changes | 6 ++++++ benchmark.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/benchmark.changes b/benchmark.changes index 46a78d2..aac83a7 100644 --- a/benchmark.changes +++ b/benchmark.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 24 14:38:01 UTC 2024 - Stefan BrĂ¼ns + +- Fix build to cope with changes in (open)SUSE specific cmake + macros, no user visible changes. + ------------------------------------------------------------------- Mon Dec 05 08:36:46 UTC 2022 - dmueller@suse.com diff --git a/benchmark.spec b/benchmark.spec index 15b946b..f3bd36f 100644 --- a/benchmark.spec +++ b/benchmark.spec @@ -1,7 +1,7 @@ # # spec file for package benchmark # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -71,7 +71,9 @@ sed -e 's|libdir=${prefix}/lib|libdir=${prefix}/%{_lib}|' \ # dont ship debug stuff rm -rf %{buildroot}%{_libexecdir}/debug # doc will be installed in different location +# Location differs between TW and SLE/Leap, clear both rm -rf %{buildroot}%{_datadir}/doc/benchmark +rm -rf %{buildroot}%{_datadir}/doc/packages/benchmark %check # path needs to be exported otherwise unit tests will fail