X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=valgrind.spec;h=bbd98ea2a7879dca9123c292334104b1de2b9112;hb=fe37a3368d8995f4f0ecf70da781376606e94ef8;hp=159cb89e6a43b13203bbb600b8f96c4eaad3cc2d;hpb=157676c93bc7d28d9a6e1befcb9b0c4726c56aa0;p=packages%2Fvalgrind.git

diff --git a/valgrind.spec b/valgrind.spec
index 159cb89..bbd98ea 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.17.0
+Version:	3.20.0
 Release:	1
 License:	GPL v2+
 Group:		Development/Tools
 Source0:	https://sourceware.org/pub/valgrind/%{name}-%{version}.tar.bz2
-# Source0-md5:	afe11b5572c3121a781433b7c0ab741b
+# Source0-md5:	e3ca8e03c6c527e80e7da5135a1b6beb
 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,9 @@ 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
+Obsoletes:	valgrind-callgrind < 0.11
+Obsoletes:	valgrind-calltree < 0.10
+ExclusiveArch:	%{ix86} %{x8664} armv7hl armv7hnl armv7l ppc ppc64 s390x x32 aarch64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautostrip	.*/vgpreload.*\\.so
@@ -60,8 +60,6 @@ pracować.
 %patch1 -p1
 %patch2 -p1
 
-sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.ac
-
 %build
 %{__aclocal}
 %{__autoconf}
@@ -70,13 +68,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"
 	--enable-only64bit \
 %endif \
-	--enable-lto=yes \
+	--enable-lto \
 	LDFLAGS="" # no strip!
 
 %{__make}
@@ -114,7 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 # TODO: subpackage?
 %attr(755,root,root) %{_libdir}/%{name}/libmpiwrap-*-linux.so
 %endif
+%if "%{_libexecdir}" != "%{_libdir}"
 %dir %{_libexecdir}/%{name}
+%endif
 %attr(755,root,root) %{_libexecdir}/%{name}/*-linux
 %attr(755,root,root) %{_libexecdir}/%{name}/vgpreload_*-linux.so
 %{_libexecdir}/%{name}/*.xml