X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=valgrind.spec;h=bbd98ea2a7879dca9123c292334104b1de2b9112;hb=HEAD;hp=9177079cbe21f9066a7fb598c9fee223c293820c;hpb=d0e750c0de6838f0b1f27453209a68db2cc6bf3f;p=packages%2Fvalgrind.git

diff --git a/valgrind.spec b/valgrind.spec
index 9177079..d95f37c 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -7,16 +7,16 @@
 Summary:	An open-source memory debugger
 Summary(pl.UTF-8):	Otwarty odpluskwiacz pamięci
 Name:		valgrind
-Version:	3.15.0
+Version:	3.23.0
 Release:	1
 License:	GPL v2+
 Group:		Development/Tools
 Source0:	https://sourceware.org/pub/valgrind/%{name}-%{version}.tar.bz2
-# Source0-md5:	46e5fbdcbc3502a5976a317a0860a975
+# Source0-md5:	c59775fcbfa82fcce796843d0aaa7538
 Patch0:		%{name}-native-cpuid.patch
 Patch1:		%{name}-ld_linux_strlen.patch
 Patch2:		%{name}-datadir.patch
-URL:		http://valgrind.org/
+URL:		https://www.valgrind.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.10
 BuildRequires:	gcc >= 5:3.0
@@ -28,9 +28,10 @@ BuildRequires:	glibc-devel >= 6:2.2
 BuildRequires:	libgomp-devel
 BuildRequires:	libstdc++-devel
 %{?with_mpi:BuildRequires:	mpi-devel}
-Obsoletes:	valgrind-callgrind
-Obsoletes:	valgrind-calltree
-ExclusiveArch:	%{ix86} %{x8664} arm ppc ppc64 s390x x32 aarch64
+BuildRequires:	rpmbuild(macros) >= 2.007
+Obsoletes:	valgrind-callgrind < 0.11
+Obsoletes:	valgrind-calltree < 0.10
+ExclusiveArch:	%{ix86} %{x8664} %{armv7} ppc ppc64 s390x x32 aarch64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautostrip	.*/vgpreload.*\\.so
@@ -38,6 +39,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # ld portion broken
 %undefine	with_ccache
 
+%define		specflags_arm	-marm
+
 %description
 Valgrind is a GPL'd system for debugging and profiling Linux programs.
 With the tools that come with Valgrind, you can automatically detect
@@ -60,7 +63,14 @@ pracować.
 %patch1 -p1
 %patch2 -p1
 
-sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.ac
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
+	cachegrind/cg_annotate.in \
+	cachegrind/cg_merge.in \
+	cachegrind/cg_diff.in
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+perl(\s|$),#!%{__perl}\1,' \
+	callgrind/callgrind_annotate.in \
+	callgrind/callgrind_control.in
 
 %build
 %{__aclocal}
@@ -70,13 +80,12 @@ sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configur
 
 ac_cv_path_GDB=/usr/bin/gdb \
 %configure \
-	CC=gcc \
 	--enable-tls \
 	%{!?with_mpi:--with-mpicc=/bin/false} \
-%if %{_lib} != "lib"
+%if "%{_lib}" != "lib"
 	--enable-only64bit \
 %endif \
-	--enable-lto=yes \
+	--enable-lto \
 	LDFLAGS="" # no strip!
 
 %{__make}
@@ -109,15 +118,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/valgrind-listener
 %attr(755,root,root) %{_bindir}/vgdb
 %dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*-linux
-%attr(755,root,root) %{_libdir}/%{name}/vgpreload_*-linux.so
+%{_libdir}/%{name}/lib*-linux.a
 %if %{with mpi}
 # TODO: subpackage?
 %attr(755,root,root) %{_libdir}/%{name}/libmpiwrap-*-linux.so
 %endif
-%{_libdir}/%{name}/*.xml
-%{_libdir}/%{name}/default.supp
-%{_libdir}/%{name}/lib*-linux.a
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/%{name}
+%endif
+%attr(755,root,root) %{_libexecdir}/%{name}/*-linux
+%attr(755,root,root) %{_libexecdir}/%{name}/valgrind-monitor.py
+%attr(755,root,root) %{_libexecdir}/%{name}/valgrind-monitor-def.py
+%attr(755,root,root) %{_libexecdir}/%{name}/vgpreload_*-linux.so
+%{_libexecdir}/%{name}/*.xml
+%{_libexecdir}/%{name}/default.supp
 %{_datadir}/%{name}
 %{_includedir}/valgrind
 %{_mandir}/man1/callgrind_annotate.1*