-%define snap 20040220
-Summary: An open-source memory debugger for x86-GNU/Linux
-Summary(pl): Otwarty odpluskwiacz pamiêci dla Linuksa x86
+# 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: 2.1.0
-Release: 1.%{snap}.1
+Version: 3.7.0
+Release: 2
License: GPL
Group: Development/Tools
-#Source0: http://developer.kde.org/~sewardj/valgrind-%{version}.tar.bz2
-Source0: %{name}-%{snap}.tar.bz2
-# Source0-md5: 1363a4e29ee9b698c37a92a6a9b62ed0
-Patch0: %{name}-include_fs.patch
-Patch1: %{name}-athlon.patch
-URL: http://valgrind.kde.org/
+Source0: http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
+# 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
-ExclusiveArch: %{ix86}
+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} arm ppc ppc64 s390x
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# Valgrind binaries should _never_ be stripped
-%define no_install_post_strip 1
-
-# Same name as libpthread
-%define _noautoprovfiles %{_libdir}/%{name}/libpthread.so.0 %{_libdir}/%{name}/libpthread.so %{_libdir}/%{name}/valgrind.so %{_libdir}/%{name}/valgrinq.so
+%define _noautostrip .*/vgpreload.*\\.so
+# ld portion broken
+%undefine with_ccache
%description
-Valgrind is a GPL'd system for debugging and profiling x86-Linux
-programs. With the tools that come with Valgrind, you can
-automatically detect many memory management and threading bugs,
-avoiding hours of frustrating bug-hunting, making your programs more
-stable. You can also perform detailed profiling to help speed up your
-programs.
+Valgrind is a GPL'd system for debugging and profiling Linux programs.
+With the tools that come with Valgrind, you can automatically detect
+many memory management and threading bugs, avoiding hours of
+frustrating bug-hunting, making your programs more stable. You can
+also perform detailed profiling to help speed up your programs.
-%description -l pl
-Valgrind jest systemem s³u¿±cym do odpluskwiania i profilowania
-programów na Linuksie uruchomionym na procesorach x86. U¿ywaj±c
-dostarczanych z nim narzêdzi mo¿na automatycznie wykrywaæ wiele
-b³êdów zwi±zanych z zarz±dzaniem pamiêci± i w±tkowaniem, dziêki
-czemu unika siê frustruj±cego polowania na b³êdy, a tak¿e czyni
-siê programy bardziej stabilnymi. Mo¿liwe jest równie¿ dok³adne
-profilowanie, dziêki któremu programy zaczn± szybciej pracowaæ.
+%description -l pl.UTF-8
+Valgrind jest systemem służącym do odpluskwiania i profilowania
+programów na Linuksie. Używając dostarczanych z nim narzędzi można
+automatycznie wykrywać wiele błędów związanych z zarządzaniem pamięcią
+i wątkowaniem, dzięki czemu unika się frustrującego polowania na
+błędy, a także czyni się programy bardziej stabilnymi. Możliwe jest
+również dokładne profilowanie, dzięki któremu programy zaczną szybciej
+pracować.
%prep
-%setup -q -n %{name}
-#%patch0 -p1
-%patch1 -p0
+%setup -q
+%patch0
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
+
+sed -i -e 's:^CFLAGS="-Wno-long-long":CFLAGS="$CFLAGS -Wno-long-long":' configure.in
%build
%{__aclocal}
%{__autoheader}
%{__autoconf}
%{__automake}
+
+ac_cv_path_GDB=/usr/bin/gdb \
%configure \
+ CC=gcc \
+ --enable-tls \
+%if %{_lib} != "lib"
+ --enable-only64bit \
+%endif
LDFLAGS="" # no strip!
+
%{__make}
%install
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-strip $RPM_BUILD_ROOT%{_libdir}/%{name}/hp2ps
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/doc
+mv docs/index.pdf docs/valgrind_manual.pdf
+mv docs/index.ps docs/valgrind_manual.ps
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README README_MISSING_SYSCALL_OR_IOCTL TODO
-%doc $RPM_BUILD_ROOT%{_docdir}/valgrind/*.html
-%attr(755,root,root) %{_bindir}/*
+%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}/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}/*.so
-%attr(755,root,root) %{_libdir}/%{name}/hp2ps
-%attr(755,root,root) %{_libdir}/%{name}/stage2
-%{_libdir}/%{name}/*.supp
-%{_includedir}/*
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/%{name}/*-linux
+%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