SPECS: valgrind.spec - no %files from $RPM_BUILD_ROOT (confuses ch...

[glen]

Author: glen                         Date: Fri May 19 15:52:14 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no %files from $RPM_BUILD_ROOT (confuses check-files)
- amd64 is back, but without multilib

---- Files affected:
SPECS:
   valgrind.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/valgrind.spec
diff -u SPECS/valgrind.spec:1.53 SPECS/valgrind.spec:1.54
--- SPECS/valgrind.spec:1.53	Fri May 19 17:15:32 2006
+++ SPECS/valgrind.spec	Fri May 19 17:52:09 2006
@@ -1,23 +1,29 @@
 # $Revision$, $Date$
+# 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.1.1
-Release:	1
+Release:	2
 License:	GPL
 Group:		Development/Tools
 Source0:	http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
 # Source0-md5:	3bbfafedb59c19bf75977381ce2eb6d7
+Patch0:		%{name}-amd64.patch
 URL:		http://valgrind.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 # Needs libc.a
 BuildRequires:	glibc-static
 Conflicts:	valgrind-calltree
-ExclusiveArch:	%{ix86} ppc
+ExclusiveArch:	%{ix86} ppc %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_noautostrip	.*/vgpreload.*\\.so
+# ld portion broken
+%undefine	with_ccache
 
 %description
 Valgrind is a GPL'd system for debugging and profiling Linux programs.
@@ -36,6 +42,7 @@
 
 %prep
 %setup -q
+%{!?with_multilib:%patch0 -p1}
 
 %build
 %{__aclocal}
@@ -53,6 +60,8 @@
 	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
@@ -60,8 +69,8 @@
 %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}
 %dir %{_libdir}/%{name}/*-linux
@@ -78,6 +87,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2006/05/19 15:52:09  glen
+- no %files from $RPM_BUILD_ROOT (confuses check-files)
+- amd64 is back, but without multilib
+
 Revision 1.53  2006/05/19 15:15:32  wolf
 - 3.1.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/valgrind.spec?r1=1.53&r2=1.54&f=u