|
From: Francois-Xavier K. <fra...@hp...> - 2006-02-23 11:43:15
|
Hello Valgrinders,
2 patches to improve rpm-based packaging of valgrind-3.1.0. Tested on
fc3/x86, fc4/x86 & rhel3/x86.
1.1) use %docdir instead of self-estimated %datadir/valgrind/...
1.2) cleanup install directory to make packaging resilient to build failure
--- valgrind.spec.in~ 2006-02-23 09:10:36.000000000 +0100
+++ valgrind.spec.in 2006-02-23 10:30:34.034689000 +0100
@@ -31,16 +31,13 @@
make
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-
+rm -rf $RPM_BUILD_ROOT
%makeinstall
-mkdir docs.installed
-mv $RPM_BUILD_ROOT%{_datadir}/doc/valgrind/* docs.installed/
%files
%defattr(-,root,root)
%doc ACKNOWLEDGEMENTS AUTHORS COPYING FAQ.txt INSTALL NEWS README*
-%doc docs.installed/*.html docs.installed/*.gif
+%{_docdir}/*
%{_bindir}/*
%{_includedir}/valgrind
%{_libdir}/valgrind
And:
2) Deliver ./configure-generated valgrind.spec in the source tarball, to
make "rpmbuild -ta" work out-of the box
--- Makefile.am~ 2005-11-25 13:36:22.000000000 +0100
+++ Makefile.am 2006-02-23 10:35:36.155843000 +0100
@@ -59,7 +59,7 @@
README_DEVELOPERS \
README_PACKAGERS \
README_MISSING_SYSCALL_OR_IOCTL \
- valgrind.spec.in valgrind.pc.in \
+ valgrind.spec.in valgrind.spec valgrind.pc.in \
Makefile.all.am Makefile.tool.am Makefile.core.am \
Makefile.tool-inplace.am \
$(VEX_PRIMARY_SOURCES)
br.
--
Francois-Xavier "FiX" KOWALSKI /_ __ Tel:+33 (0)4 76 14 63 27
OpenCall Business Unit -- OCBU / //_/ Fax:+33 (0)4 76 14 51 62
Media-Processing Engineering / http://www.hp.com/go/opencall
i n v e n t
|