From 35dce96d57e322e4ed35e4fa16544480e05579c6 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@fedoraproject.org>
Date: Apr 12 2010 12:22:43 +0000
Subject: 3.5.0-16


---

diff --git a/valgrind-3.5.0-capget.patch b/valgrind-3.5.0-capget.patch
new file mode 100644
index 0000000..f064567
--- /dev/null
+++ b/valgrind-3.5.0-capget.patch
@@ -0,0 +1,14 @@
+--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c.jj	2010-04-07 08:14:12.000000000 -0400
++++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	2010-04-12 07:24:12.838876000 -0400
+@@ -1955,8 +1955,9 @@ PRE(sys_capget)
+                  vki_cap_user_header_t, header, vki_cap_user_data_t, data);
+    PRE_MEM_READ( "capget(header)", ARG1, 
+                   sizeof(struct __vki_user_cap_header_struct) );
+-   PRE_MEM_WRITE( "capget(data)", ARG2, 
+-                  sizeof(struct __vki_user_cap_data_struct) );
++   if (ARG2 != (Addr)NULL)
++      PRE_MEM_WRITE( "capget(data)", ARG2, 
++                      sizeof(struct __vki_user_cap_data_struct) );
+ }
+ POST(sys_capget)
+ {
diff --git a/valgrind-3.5.0-config_h.patch b/valgrind-3.5.0-config_h.patch
new file mode 100644
index 0000000..a95b9e3
--- /dev/null
+++ b/valgrind-3.5.0-config_h.patch
@@ -0,0 +1,22 @@
+--- valgrind-3.5.0/include/pub_tool_basics.h.jj	2009-08-19 09:37:08.000000000 -0400
++++ valgrind-3.5.0/include/pub_tool_basics.h	2010-04-09 06:10:59.047422000 -0400
+@@ -49,10 +49,6 @@
+ // For varargs types
+ #include <stdarg.h>
+ 
+-/* For HAVE_BUILTIN_EXPECT */
+-#include "config.h"
+-
+-
+ /* ---------------------------------------------------------------------
+    symbol prefixing
+    ------------------------------------------------------------------ */
+@@ -315,7 +311,7 @@ static inline Bool sr_EQ ( SysRes sr1, S
+ #define VG_BUGS_TO "www.valgrind.org"
+ 
+ /* Branch prediction hints. */
+-#if HAVE_BUILTIN_EXPECT
++#if defined(__GNUC__) && (__GNUC__ >= 3)
+ #  define LIKELY(x)   __builtin_expect(!!(x), 1)
+ #  define UNLIKELY(x) __builtin_expect((x), 0)
+ #else
diff --git a/valgrind.spec b/valgrind.spec
index 281b571..e50bf22 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -83,6 +83,16 @@ Requires: valgrind = %{epoch}:%{version}-%{release}
 Header files and libraries for development of valgrind aware programs
 or valgrind plugins.
 
+%package openmpi
+Summary: OpenMPI support for valgrind
+Group: Development/Debuggers
+Requires: valgrind = %{epoch}:%{version}-%{release}
+
+%description openmpi
+A wrapper library for debugging OpenMPI parallel programs with valgrind.
+See file:///usr/share/doc/valgrind-%{version}/html/mc-manual.html#mc-manual.mpiwrap
+for details.
+
 %prep
 %setup -q
 %patch1 -p1
@@ -110,7 +120,6 @@ or valgrind plugins.
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
-%patch26 -p1
 %patch27 -p1
 
 %build
@@ -177,6 +186,10 @@ popd
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/valgrind/*.supp.in
 
+cd $RPM_BUILD_ROOT%{_includedir}/valgrind
+patch < %{PATCH26}
+rm -f *.orig
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -186,7 +199,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs.installed/html docs.installed/*.pdf
 %{_bindir}/*
 %dir %{_libdir}/valgrind
-%{_libdir}/valgrind/*[^a]
+%{_libdir}/valgrind/*[^ao]
+%{_libdir}/valgrind/[^l]*o
 %{_mandir}/man1/*
 
 %files devel
@@ -196,10 +210,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/valgrind/*.a
 %{_libdir}/pkgconfig/*
 
+%files openmpi
+%defattr(-,root,root)
+%dir %{_libdir}/valgrind
+%{_libdir}/valgrind/libmpiwrap*.so
+
 %changelog
 * Mon Apr 12 2010 Jakub Jelinek <jakub@redhat.com> 3.5.0-16
 - change pub_tool_basics.h not to include config.h (#579283)
-- add openmpi support (#565541)
+- add valgrind-openmpi package for OpenMPI support (#565541)
 - allow NULL second argument to capget (#450976)
 
 * Wed Apr  7 2010 Jakub Jelinek <jakub@redhat.com> 3.5.0-15