use arm family macro

[packages/valgrind.git] / valgrind.spec

diff --git a/valgrind.spec b/valgrind.spec
index cf986c01bd76b21ee8960da4e9b191ecca1045d9..b27486de4ec36e87c7d7ffaaf83f0e46cb1d90b8 100644 (file)
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -7,12 +7,12 @@
 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
@@ -28,9 +28,10 @@ BuildRequires:       glibc-devel >= 6:2.2
 BuildRequires: libgomp-devel
 BuildRequires: libstdc++-devel
 %{?with_mpi:BuildRequires:     mpi-devel}
+BuildRequires: rpmbuild(macros) >= 2.007
 Obsoletes:     valgrind-callgrind < 0.11
 Obsoletes:     valgrind-calltree < 0.10
-ExclusiveArch: %{ix86} %{x8664} armv7hl armv7hnl armv7l ppc ppc64 s390x x32 aarch64
+ExclusiveArch: %{ix86} %{x8664} %{armv7} ppc ppc64 s390x x32 aarch64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautostrip    .*/vgpreload.*\\.so
@@ -60,8 +61,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,7 +69,6 @@ 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"