X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvalgrind.git;a=blobdiff_plain;f=valgrind.spec;h=7911f50ff475c5eca6f078bc8643ee467efa01b1;hp=c568c2c478d73009cb5daad7f81c5df2b49abb99;hb=4ed0a07929d1e74690a6a5acc22cca85bb27ffa8;hpb=6a71ccd9f0e44aed2ddef3ad7764b5dbbc481f7b

diff --git a/valgrind.spec b/valgrind.spec
index c568c2c..7911f50 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,23 +1,31 @@
+# TODO:
+# - fix CC detection in configure, so CC=gcc won't be needed
 Summary:	An open-source memory debugger
 Summary(pl.UTF-8):	Otwarty odpluskwiacz pamięci
 Name:		valgrind
-Version:	3.6.1
-Release:	1
+Version:	3.7.0
+Release:	3
 License:	GPL
 Group:		Development/Tools
 Source0:	http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	2c3aa122498baecc9d69194057ca88f5
+# Source0-md5:	a855fda56edf05614f099dca316d1775
 Patch0:		%{name}-debuginfo.patch
 Patch1:		%{name}-native-cpuid.patch
+Patch2:		%{name}-automake-1.11.2.patch
+Patch3:		%{name}-ld_linux_strlen.patch
 URL:		http://valgrind.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	gcc >= 5:3.0
 # Needs libc.a
+BuildRequires:	glibc-devel >= 6:2.2
+BuildRequires:	glibc-devel < 6:2.15
 BuildRequires:	glibc-static
 BuildRequires:	libgomp-devel
+BuildRequires:	libstdc++-devel
 Obsoletes:	valgrind-callgrind
 Obsoletes:	valgrind-calltree
-ExclusiveArch:	%{ix86} %{x8664} ppc ppc64
+ExclusiveArch:	%{ix86} %{x8664} arm ppc ppc64 s390x
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautostrip	.*/vgpreload.*\\.so
@@ -44,6 +52,8 @@ pracować.
 %setup -q
 %patch0
 %patch1 -p1
+%patch2 -p0
+%patch3 -p1
 
 sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
 
@@ -55,6 +65,7 @@ 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 \
 %if %{_lib} != "lib"
 	--enable-only64bit \
@@ -69,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc
 mv docs/index.pdf docs/valgrind_manual.pdf
 mv docs/index.ps docs/valgrind_manual.ps
 
@@ -80,12 +91,25 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README README_MISSING_SYSCALL_OR_IOCTL
 %doc docs/html docs/valgrind_manual.pdf docs/valgrind_manual.ps
-%attr(755,root,root) %{_bindir}/*
-%{_includedir}/*
+%attr(755,root,root) %{_bindir}/callgrind_annotate
+%attr(755,root,root) %{_bindir}/callgrind_control
+%attr(755,root,root) %{_bindir}/cg_annotate
+%attr(755,root,root) %{_bindir}/cg_diff
+%attr(755,root,root) %{_bindir}/cg_merge
+%attr(755,root,root) %{_bindir}/ms_print
+%attr(755,root,root) %{_bindir}/valgrind
+%attr(755,root,root) %{_bindir}/valgrind-listener
+%attr(755,root,root) %{_bindir}/vgdb
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/*-linux
-%{_libdir}/%{name}/*.a
-%attr(755,root,root) %{_libdir}/%{name}/*.so
-%{_libdir}/%{name}/*.supp
-%{_mandir}/man1/*.1*
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/%{name}/vgpreload_*-linux.so
+%{_libdir}/%{name}/*.xml
+%{_libdir}/%{name}/default.supp
+%{_libdir}/%{name}/lib*-linux.a
+%{_includedir}/valgrind
+%{_mandir}/man1/callgrind_annotate.1*
+%{_mandir}/man1/callgrind_control.1*
+%{_mandir}/man1/cg_annotate.1*
+%{_mandir}/man1/ms_print.1*
+%{_mandir}/man1/valgrind.1*
+%{_pkgconfigdir}/valgrind.pc