- no %files from $RPM_BUILD_ROOT (confuses check-files)

[packages/valgrind.git] / valgrind.spec

diff --git a/valgrind.spec b/valgrind.spec
index 50ca6cd9422470d42a022dd84cfa096e72e82251..d62800146ca7dd63930068d28a8b7aa8593016d5 100644 (file)
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,47 +1,47 @@
-%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:       2.1.2
-Release:       0.%{_snap}.1
+Version:       3.1.1
+Release:       2
 License:       GPL
 Group:         Development/Tools
-#Source0:      http://developer.kde.org/~sewardj/valgrind-%{version}.tar.bz2
-Source0:       %{name}-%{_snap}.tar.bz2
-# Source0-md5: adeb714a14f5b79dae30eb0e46515e83
-URL:           http://valgrind.kde.org/
-# Needs libc.a
-BuildRequires: glibc-static  
+Source0:       http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
+# Source0-md5: 3bbfafedb59c19bf75977381ce2eb6d7
+Patch0:                %{name}-amd64.patch
+URL:           http://valgrind.org/
 BuildRequires: autoconf
 BuildRequires: automake
-ExclusiveArch: %{ix86}
+# Needs libc.a
+BuildRequires: glibc-static
+Conflicts:     valgrind-calltree
+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 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 -n %{name}-%{_snap}
+%setup -q
+%{!?with_multilib:%patch0 -p1}
 
 %build
 %{__aclocal}
@@ -59,20 +59,23 @@ 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
 
 %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
+%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}/*
 %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
+%{_mandir}/man1/*.1*