From ea8f56fd2d337b8a0f4d17a5c53b4130fbfd345f Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Sep 15 2014 06:57:40 +0000
Subject: Use system valgrind.h, BZ 1141477


---

diff --git a/pidgin-2.10.9-valgrind.patch b/pidgin-2.10.9-valgrind.patch
new file mode 100644
index 0000000..64775c4
--- /dev/null
+++ b/pidgin-2.10.9-valgrind.patch
@@ -0,0 +1,12 @@
+--- a/libpurple/Makefile.am	2014-02-02 22:29:17.000000000 +0100
++++ b/libpurple/Makefile.am	2014-09-15 08:47:31.352256368 +0200
+@@ -284,8 +284,7 @@
+ 
+ noinst_HEADERS= \
+ 	internal.h \
+-	media/backend-fs2.h \
+-	valgrind.h
++	media/backend-fs2.h
+ 
+ libpurpleincludedir=$(includedir)/libpurple
+ libpurpleinclude_HEADERS = \
diff --git a/pidgin.spec b/pidgin.spec
index 457016f..14b6165 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -119,7 +119,7 @@
 
 Name:           pidgin
 Version:        2.10.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -154,6 +154,7 @@ Source1:        purple-fedora-prefs.xml
 
 ## Patches 0-99: Fedora specific or upstream wont accept
 Patch0:         pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
+Patch1:         pidgin-2.10.9-valgrind.patch
 
 ## Patches 100+: To be Included in Future Upstream
 Patch100:       pidgin-2.10.1-fix-msn-ft-crashes.patch
@@ -279,6 +280,9 @@ BuildRequires:  libgadu-devel
 BuildRequires:  doxygen
 %endif
 
+# Use distribution's valgrind.h
+BuildRequires:  valgrind-devel
+
 # Need rpm 4.9+ to be able to do this filtering in arch packages with binaries
 %if 0%{?fedora} >= 15
 # Filter out plugins from provides
@@ -457,6 +461,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %if %{force_sound_aplay}
 %patch0 -p1 -b .aplay
 %endif
+%patch1 -p1
 
 ## Patches 100+: To be Included in Future Upstream
 
@@ -480,6 +485,10 @@ for file in finch/plugins/pietray.py libpurple/purple-remote libpurple/plugins/d
     sed -i 's/env python/python/' $file
 done
 
+# Bug #1141477
+rm -f libpurple/valgrind.h
+sed -ie 's/include "valgrind.h"/include <valgrind\/valgrind.h>/' libpurple/plugin.c
+
 %build
 SWITCHES="--with-extraversion=%{release}"
 %if ! %{krb4_removed}
@@ -757,6 +766,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 15 2014 Jan Synacek <jsynacek@redhat.com> - 2.10.9-6
+- Use system valgrind.h, BZ 1141477
+
 * Thu Aug 28 2014 Jitka Plesnikova <jplesnik@redhat.com> - 2.10.9-5
 - Perl 5.20 rebuild