[lwp] use system valgrind

[Tom Callaway]

commit e8a1e0ea589ba0c071b6bfac6058a69539ff731e
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Dec 2 15:53:23 2014 -0500

    use system valgrind

 lwp-2.6-system-valgrind.h |   36 ++++++++++++++++++++++++++++++++++++
 lwp.spec                  |   11 ++++++++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/lwp-2.6-system-valgrind.h b/lwp-2.6-system-valgrind.h
new file mode 100644
index 0000000..456be0e
--- /dev/null
+++ b/lwp-2.6-system-valgrind.h
@@ -0,0 +1,36 @@
+diff -up lwp-2.6/src/lwp.c.system-valgrind lwp-2.6/src/lwp.c
+--- lwp-2.6/src/lwp.c.system-valgrind	2014-12-02 15:39:10.946093997 -0500
++++ lwp-2.6/src/lwp.c	2014-12-02 15:48:07.430940643 -0500
+@@ -64,7 +64,7 @@ Pittsburgh, PA.
+ #include "lwp_ucontext.h"
+ #include "lwp_stacktrace.h"
+ 
+-#include "valgrind.h"
++#include <valgrind/valgrind.h>
+ 
+ #define  ON	    1
+ #define  OFF	    0
+diff -up lwp-2.6/src/Makefile.am.system-valgrind lwp-2.6/src/Makefile.am
+--- lwp-2.6/src/Makefile.am.system-valgrind	2014-12-02 15:48:14.630898704 -0500
++++ lwp-2.6/src/Makefile.am	2014-12-02 15:48:23.934844509 -0500
+@@ -8,7 +8,7 @@ LDADD = liblwp.la
+ 
+ liblwp_la_SOURCES = fasttime.c iomgr.c lock.c lwp.c timer.c process.S \
+ 		    lwp_ucontext.c lwp_ucontext.h lwp_stacktrace.c \
+-		    lwp_stacktrace.h lwp.private.h valgrind.h
++		    lwp_stacktrace.h lwp.private.h
+ liblwp_la_CPPFLAGS = $(AM_CPPFLAGS) -DLWPDEBUG
+ liblwp_la_LDFLAGS = $(LIBTOOL_LDFLAGS)
+ 
+diff -up lwp-2.6/src/Makefile.in.system-valgrind lwp-2.6/src/Makefile.in
+--- lwp-2.6/src/Makefile.in.system-valgrind	2014-12-02 15:48:29.290813311 -0500
++++ lwp-2.6/src/Makefile.in	2014-12-02 15:48:38.838757695 -0500
+@@ -262,7 +262,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
+ LDADD = liblwp.la
+ liblwp_la_SOURCES = fasttime.c iomgr.c lock.c lwp.c timer.c process.S \
+ 		    lwp_ucontext.c lwp_ucontext.h lwp_stacktrace.c \
+-		    lwp_stacktrace.h lwp.private.h valgrind.h
++		    lwp_stacktrace.h lwp.private.h
+ 
+ liblwp_la_CPPFLAGS = $(AM_CPPFLAGS) -DLWPDEBUG
+ liblwp_la_LDFLAGS = $(LIBTOOL_LDFLAGS)
diff --git a/lwp.spec b/lwp.spec
index 2c0e1c9..b0c95be 100644
--- a/lwp.spec
+++ b/lwp.spec
@@ -1,6 +1,6 @@
 Name:           lwp
 Version:        2.6
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        C library for user-mode threading
 Group:          System Environment/Libraries
 License:        LGPLv2
@@ -8,6 +8,8 @@ URL:            http://www.coda.cs.cmu.edu/
 Source0:        ftp://ftp.coda.cs.cmu.edu/pub/lwp/src/%{name}-%{version}.tar.gz
 Source1:        ftp://ftp.coda.cs.cmu.edu/pub/lwp/src/%{name}-%{version}.tar.gz.asc
 Patch0:         lwp-2.6-no-longjmp_chk.patch
+Patch1:		lwp-2.6-system-valgrind.h
+BuildRequires:	valgrind-devel
 
 %description
 The LWP user-space threads library. The LWP threads library is used by the Coda
@@ -26,6 +28,10 @@ developing applications that use %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .nolongjmpchk
+%patch1 -p1 -b .system-valgrind
+
+# using system header
+rm -rf src/valgrind.h
 
 %build
 %configure --disable-static
@@ -51,6 +57,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Dec  2 2014 Tom Callaway <spot at fedoraproject.org> - 2.6-11
+- use system valgrind header (bz1141475)
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild