diff --git a/dhat-use-datadir.patch b/dhat-use-datadir.patch new file mode 100644 index 0000000..bf3c8d2 --- /dev/null +++ b/dhat-use-datadir.patch @@ -0,0 +1,13 @@ +diff --git a/dhat/Makefile.am b/dhat/Makefile.am +index 2aa4ac99e..4a571cb77 100644 +--- a/dhat/Makefile.am ++++ b/dhat/Makefile.am +@@ -9,7 +9,7 @@ EXTRA_DIST = docs/dh-manual.xml dh_view.html dh_view.css dh_view.js + #---------------------------------------------------------------------------- + + # Ensure the viewer components get copied into the install tree. +-dhatdir = $(pkglibexecdir) ++dhatdir = $(pkgdatadir) + dhat_DATA = dh_view.html dh_view.css dh_view.js + + #---------------------------------------------------------------------------- diff --git a/valgrind.changes b/valgrind.changes index 45b581d..68d9f2a 100644 --- a/valgrind.changes +++ b/valgrind.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 11 12:14:25 UTC 2020 - Dirk Mueller + +- add dhat-use-datadir.patch: + * move the dhat* scripts to datadir + ------------------------------------------------------------------- Wed Mar 25 12:15:59 UTC 2020 - Martin Liška diff --git a/valgrind.spec b/valgrind.spec index 45aae6c..ca63cf2 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -49,6 +49,7 @@ Patch6: 0001-s390x-Add-models-z14-and-z14-ZR1.patch Patch7: 0001-s390x-Clean-up-s390-check-opcodes.pl.patch Patch8: 0001-s390x-Add-CPU-model-for-z15.patch Patch9: parallel-lto.patch +Patch10: dhat-use-datadir.patch %if "%{flavor}" == "" %if %{with docs} BuildRequires: docbook-xsl-stylesheets @@ -166,6 +167,7 @@ but it has been successfully used to optimize several KDE applications. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build %if "%{flavor}" == "" @@ -286,8 +288,8 @@ VALGRIND_LIB=$PWD/.in_place VALGRIND_LIB_INNER=$PWD/.in_place ./coregrind/valgri %ifarch %arm %{_libdir}/valgrind/*-arm-linux %endif -%dir /usr/lib/valgrind -/usr/lib/valgrind/dh_view* +%dir %{_datadir}/valgrind +%{_datadir}/valgrind/dh_view* %{_libdir}/valgrind/*-linux.so %{_libdir}/valgrind/*.supp %{_libdir}/valgrind/64bit-core.xml