Include valgrind.spec in the tarball, as it makes things easier for

packagers.  Fixes bug 188560.

Also updated the contents of valgrind.spec.in a bit.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10405

diff --git a/Makefile.am b/Makefile.am
index 3d180d119980c5623edfbeb98e33bbc2d9b4c39c..5c8f043da18bb0999460261672c2d6f4c68ae731 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,13 +89,16 @@ perf: check
 # Nb: no need to include any Makefile.am files here, or files included from
 # them, as automake includes them automatically.  Also not COPYING, README
 # or NEWS.
+# We include valgrind.spec as well as valgrind.spec.in to save packagers
+# from having to run configure (bug 188560).
 EXTRA_DIST = \
        COPYING.DOCS \
        README_DEVELOPERS \
        README_PACKAGERS \
        README_MISSING_SYSCALL_OR_IOCTL \
        valgrind.pc.in \
-       valgrind.spec.in
+       valgrind.spec.in \
+       valgrind.spec
 
 dist_noinst_SCRIPTS = \
        vg-in-place

diff --git a/valgrind.spec.in b/valgrind.spec.in
index 54d3f4c30c1a8cb77e198b6609c302125485325d..5fd3002389dc0c6cfa45bca0fc4efe8719d2ebea 100644 (file)
--- a/valgrind.spec.in
+++ b/valgrind.spec.in
@@ -6,22 +6,19 @@ Epoch: 1
 License: GPL
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
-Packager: Jeremy Fitzhardinge <jeremy@goop.org>
+Packager: Julian Seward <jseward@acm.org>
 Source: @PACKAGE@-@VERSION@.tar.bz2
 
 Buildroot: %{_tmppath}/%{name}-root
 
 %description 
 
-Valgrind is an award-winning suite of tools 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 speed up and reduce memory use of your
-programs.
-
-The Valgrind distribution currently includes five tools: two memory error
-detectors, a thread error detector, a cache profiler and a heap profiler.
+Valgrind is an award-winning instrumentation framework for building dynamic
+analysis tools. There are Valgrind tools that can automatically detect many
+memory management and threading bugs, and profile your programs in detail. You
+can also use Valgrind to build new tools.  Valgrind runs on the following
+platforms: x86/Linux, AMD64/Linux, PPC32/Linux, PPC64/Linux, x86/MacOSX,
+AMD64/MacOSX.
 
 %prep
 %setup -n @PACKAGE@-@VERSION@
@@ -39,7 +36,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/valgrind/* docs.installed/
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING FAQ.txt INSTALL NEWS README*
+%doc AUTHORS COPYING FAQ.txt NEWS README*
 %doc docs.installed/html/*.html docs.installed/html/images/*.png
 %{_bindir}/*
 %{_includedir}/valgrind