skip autostrip of *.[ch] files which confuse `file`; rel 2

[packages/valgrind.git] / valgrind.spec

diff --git a/valgrind.spec b/valgrind.spec
index 0d02255a95ff403e84c53e90906a753cd04030bd..f07f03480fe6aef566b1228dcb618b34dffca3a3 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
-Release:       1
+Version:       3.22.0
+Release:       2
 License:       GPL v2+
 Group:         Development/Tools
 Source0:       https://sourceware.org/pub/valgrind/%{name}-%{version}.tar.bz2
-# Source0-md5: afe11b5572c3121a781433b7c0ab741b
+# Source0-md5: 38ea14f567efa09687a822b33b4d9d60
 Patch0:                %{name}-native-cpuid.patch
 Patch1:                %{name}-ld_linux_strlen.patch
 Patch2:                %{name}-datadir.patch
@@ -28,16 +28,19 @@ 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} %{arm} 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
+%define                _noautostrip    .*\\(/vgpreload.*\\.so\\|\\.[ch]$\\)
 %define                filterout_c     -fstack-protector-strong
 # 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,7 +80,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"
@@ -118,6 +127,8 @@ rm -rf $RPM_BUILD_ROOT
 %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