[libjingle] missing patches

[Tom Callaway]

commit d309fe95ccf1b11f9633caf7b23125d52e49046e
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Mar 21 11:03:30 2012 -0400

    missing patches

 libjingle-0.6.6-unistd.patch |   11 +++++++++++
 libjingle.spec               |    8 ++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/libjingle-0.6.6-unistd.patch b/libjingle-0.6.6-unistd.patch
index a896837..a2b1742 100644
--- a/libjingle-0.6.6-unistd.patch
+++ b/libjingle-0.6.6-unistd.patch
@@ -21,3 +21,14 @@ diff -up libjingle-0.6.6/talk/session/phone/v4llookup.cc.unistd libjingle-0.6.6/
  
  #include <cstring>
  
+diff -up libjingle-0.6.10/talk/base/rollingaccumulator.h.gcc47 libjingle-0.6.10/talk/base/rollingaccumulator.h
+--- libjingle-0.6.10/talk/base/rollingaccumulator.h.gcc47	2012-02-13 21:59:27.755326807 -0500
++++ libjingle-0.6.10/talk/base/rollingaccumulator.h	2012-02-13 21:59:37.185231575 -0500
+@@ -29,6 +29,7 @@
+ #define TALK_BASE_ROLLINGACCUMULATOR_H_
+ 
+ #include <vector>
++#include <unistd.h>
+ 
+ #include "talk/base/common.h"
+ 
diff --git a/libjingle.spec b/libjingle.spec
index 32da8e3..55d02ff 100644
--- a/libjingle.spec
+++ b/libjingle.spec
@@ -1,6 +1,6 @@
 Name:           libjingle
 Version:        0.6.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GoogleTalk implementation of Jingle
 Group:          System Environment/Libraries
 License:        BSD
@@ -55,8 +55,6 @@ Patch19:	libjingle-0.6.10-nextfix.patch
 Patch20:	libjingle-0.6.6-unistd.patch
 # Add missing fdwalk bits from svn
 Patch21:	libjingle-0.6.10-fdwalk.patch
-# Fix gcc compile issues
-Patch22:	libjingle-0.6.10-gcc47.patch
 
 BuildRequires:	libtool, autoconf, automake
 BuildRequires:	openssl-devel
@@ -114,7 +112,6 @@ developing applications that use %{name}.
 # %patch19 -p1 -b .nextfix
 %patch20 -p1 -b .unistd
 %patch21 -p1 -b .fdwalk
-%patch22 -p1 -b .gcc47
 
 touch NEWS ChangeLog
 autoreconf -i
@@ -159,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 21 2012 Tom Callaway <spot at fedoraproject.org> - 0.6.10-2
+- resolve patch confusion
+
 * Mon Feb 13 2012 Tom Callaway <spot at fedoraproject.org> - 0.6.10-1
 - update to 0.6.10