X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvalgrind.git;a=blobdiff_plain;f=valgrind.spec;h=3c12aba0015fc493e444abc48a3a6fbe91fbf4a4;hp=07a97eb83bd2ff8372510a6f6fb086b5f0d9f1c9;hb=11f547994c39e9adf47f3c9871c8e0966195aa52;hpb=c65904af6b7398e78bcff65f4de9602d2bce089e

diff --git a/valgrind.spec b/valgrind.spec
index 07a97eb..3c12aba 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,63 +1,49 @@
-#%define		snap	20031012
-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:	2.1.0
+Version:	3.2.0
 Release:	1
 License:	GPL
 Group:		Development/Tools
-Source0:	http://developer.kde.org/~sewardj/valgrind-%{version}.tar.bz2
-# Source0-md5:	3e4056dd45163a5f555a23ced2f95191
-#Source0:	%{name}-%{snap}.tar.bz2
-Patch0:		%{name}-include_fs.patch
-URL:		http://valgrind.kde.org/
+Source0:	http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
+# Source0-md5:	c418026ce7c38a740ef17efe59509fcf
+Patch0:		%{name}-amd64.patch
+URL:		http://valgrind.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-ExclusiveArch:	%{ix86}
+# Needs libc.a
+BuildRequires:	glibc-static
+Obsoletes:	valgrind-callgrind
+Obsoletes:	valgrind-calltree
+# ppc64 was added
+ExclusiveArch:	%{ix86} ppc %{x8664}
 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 flexible tool for debugging and profiling Linux-x86
-executables. The tool consists of a core, which provides a synthetic
-x86 CPU in software, and a series of "skins", each of which is a
-debugging or profiling tool. The architecture is modular, so that new
-skins can be created easily and without disturbing the existing
-structure.
-
-A number of useful skins are supplied as standard. In summary, these
-are:
-- The memcheck skin detects memory-management problems in your
-  programs,
-- cachegrind performs detailed simulation of the I1, D1 and L2 caches
-  in your CPU and so can accurately pinpoint the sources of cache misses
-  in your code,
-- addrcheck skin is a lightweight version of memcheck,
-- helgrind is designed to find data races in multithreaded 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 elastycznym narzêdziem s³u¿±cym do odpluskwiania i
-profilowania programów pod Linuksem. Sk³ada siê z rdzenia
-dostarczaj±cego syntetyczny emulowany procesor zgodny z x86 i ze
-"skórek" bêd±cych narzêdziami o ró¿nych zastosowaniach. Architektura
-programu jest modularna, wobec czego ³atwo mo¿na stworzyæ nowe skórki
-nie ryzykuj±c popsucia reszty.
-
-Standardowo dostarczone jest kilka u¿ytecznych skórek:
-- memcheck wykrywa problemy z zarz±dzaniem pamiêci± w programach,
-- cachegrind przeprowadza symulacjê pamiêci cache procesora w celu
-  znalezienia miejsc, w których cache zawodzi,
-- addrcheck jest lekk± wersj± memchecka,
-- helgrind wykrywa konflikty dostêpu w wielow±tkowych programach.
+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
-%patch0 -p1
+#%{!?with_multilib:%patch0 -p1}
 
 %build
 %{__aclocal}
@@ -74,15 +60,24 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	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
 
 %files
 %defattr(644,root,root,755)
-%doc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS PATCHES_APPLIED
-%doc README README_MISSING_SYSCALL_OR_IOCTL TODO
-%doc $RPM_BUILD_ROOT%{_docdir}/valgrind/*.html
+%doc ACKNOWLEDGEMENTS AUTHORS FAQ.txt NEWS README README_MISSING_SYSCALL_OR_IOCTL
+%doc _docs/html
+%doc _docs/valgrind_manual.pdf
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/%{name}
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/*-linux
+%attr(755,root,root) %{_libdir}/%{name}/*-linux/*
+%attr(755,root,root) %{_libdir}/%{name}/hp2ps
+%{_libdir}/%{name}/*.supp
 %{_includedir}/*
 %{_pkgconfigdir}/*.pc
+%{_mandir}/man1/*.1*