X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvalgrind.git;a=blobdiff_plain;f=valgrind.spec;h=f31189a15e69d7177cbafb6d1804f647e9c5fc34;hp=349603055ce99d836770c17552e8bb94c5d06e50;hb=69f988a5e53cb2aff38a27f524311337cb3dadcb;hpb=b022f2ad662f7946776ed1dae2d2a262ee7e9406

diff --git a/valgrind.spec b/valgrind.spec
index 3496030..f31189a 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,47 +1,48 @@
-#%define		_snap	20040612
-Summary:	An open-source memory debugger for x86-GNU/Linux
-Summary(pl):	Otwarty odpluskwiacz pamiêci dla Linuksa x86
+# Conditional build:
+%bcond_with	multilib	# enable multilib on amd64
+#
+Summary:	An open-source memory debugger
+Summary(pl):	Otwarty odpluskwiacz pamiêci
 Name:		valgrind
-Version:	3.0.1
+Version:	3.2.0
 Release:	1
 License:	GPL
 Group:		Development/Tools
 Source0:	http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	c29efdb7d1a93440f5644a6769054681
+# Source0-md5:	c418026ce7c38a740ef17efe59509fcf
+Patch0:		%{name}-amd64.patch
 URL:		http://valgrind.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 # Needs libc.a
 BuildRequires:	glibc-static
-Conflicts:	valgrind-calltree
-ExclusiveArch:	%{ix86} %{x8664}
+Obsoletes:	valgrind-callgrind
+Obsoletes:	valgrind-calltree
+ExclusiveArch:	%{ix86} %{x8664} ppc ppc64
 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æ.
+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
+#%{!?with_multilib:%patch0 -p1}
 
 %build
 %{__aclocal}
@@ -59,6 +60,8 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 strip $RPM_BUILD_ROOT%{_libdir}/%{name}/hp2ps
+rm -rf _docs
+mv $RPM_BUILD_ROOT%{_docdir}/valgrind _docs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,14 +69,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README README_MISSING_SYSCALL_OR_IOCTL
-%doc $RPM_BUILD_ROOT%{_docdir}/valgrind/html
-%doc $RPM_BUILD_ROOT%{_docdir}/valgrind/valgrind_manual.pdf
+%doc _docs/html
+%doc _docs/valgrind_manual.pdf
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/*.so
-#%{_libdir}/%{name}/*.so.*
+%dir %{_libdir}/%{name}/*-linux
+%attr(755,root,root) %{_libdir}/%{name}/*-linux/*
 %attr(755,root,root) %{_libdir}/%{name}/hp2ps
-%attr(755,root,root) %{_libdir}/%{name}/stage2
 %{_libdir}/%{name}/*.supp
 %{_includedir}/*
 %{_pkgconfigdir}/*.pc