- added datadir patch (install dhat static data to pkgdatadir)

diff --git a/valgrind-datadir.patch b/valgrind-datadir.patch
new file mode 100644 (file)
index 0000000..48e9527
--- /dev/null
+++ b/valgrind-datadir.patch
@@ -0,0 +1,11 @@
+--- valgrind-3.15.0/dhat/Makefile.am.orig      2019-04-13 12:56:21.000000000 +0200
++++ valgrind-3.15.0/dhat/Makefile.am   2019-06-08 21:33:09.268983176 +0200
+@@ -9,7 +9,7 @@
+ #----------------------------------------------------------------------------
+ 
+ # 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.spec b/valgrind.spec
index ec5338b8804e56b379a2a97315fb19d52ce2251d..1c74e929c76692472ee57d31f167eb1df25d663f 100644 (file)
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -15,6 +15,7 @@ Source0:      https://sourceware.org/pub/valgrind/%{name}-%{version}.tar.bz2
 # Source0-md5: 46e5fbdcbc3502a5976a317a0860a975
 Patch0:                %{name}-native-cpuid.patch
 Patch1:                %{name}-ld_linux_strlen.patch
+Patch2:                %{name}-datadir.patch
 URL:           http://valgrind.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.10
@@ -57,6 +58,7 @@ pracować.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.ac
 
@@ -116,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/*.xml
 %{_libdir}/%{name}/default.supp
 %{_libdir}/%{name}/lib*-linux.a
-%{_libexecdir}/%{name}
+%{_datadir}/%{name}
 %{_includedir}/valgrind
 %{_mandir}/man1/callgrind_annotate.1*
 %{_mandir}/man1/callgrind_control.1*