Merge in changes from the 2.4.0 line. This basically brings in the
overhaul of the thread support. Many things are now probably broken,
but at least with --tool=none, simple and not-so-simple threaded and
non-thread programs work.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3265 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/valgrind.spec.in b/valgrind.spec.in
index 5c4e3d3..e3424a1 100644
--- a/valgrind.spec.in
+++ b/valgrind.spec.in
@@ -35,7 +35,7 @@
%defattr(-,root,root)
/usr/include/valgrind/valgrind.h
/usr/include/valgrind/memcheck.h
-/usr/include/valgrind/helgrind.h
+#/usr/include/valgrind/helgrind.h
/usr/include/valgrind/basic_types.h
/usr/include/valgrind/tool.h
/usr/include/valgrind/tool_asm.h
@@ -51,9 +51,8 @@
/usr/include/valgrind/x86-linux/vki_arch_posixtypes.h
/usr/bin/valgrind
/usr/bin/cg_annotate
-/usr/lib/valgrind
-/usr/lib/valgrind/*
/usr/bin/valgrind-listener
+/usr/lib/valgrind
/usr/lib/pkgconfig/valgrind.pc
%doc