[pidgin] Sync with f15 branch and rebuild for NM 0.9

[Daniel Williams]

commit 8064a6f980ba40d723febdcdba1dbf3b58258d2a
Author: Dan Williams <dcbw at redhat.com>
Date:   Fri Mar 25 16:11:59 2011 -0500

    Sync with f15 branch and rebuild for NM 0.9

 pidgin.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/pidgin.spec b/pidgin.spec
index 8c59406..28be8ca 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -98,7 +98,7 @@
 
 Name:           pidgin
 Version:        2.7.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -132,10 +132,9 @@ 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: nm09-pidgin.patch
-
 ## Patches 100+: To be Included in Future Upstream
 Patch100:       pidgin-2.7.7-msn-disable-msnp16.patch
+Patch101: nm09-pidgin.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Summary:        A Gtk+ based multiprotocol instant messaging client
@@ -410,7 +409,6 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 %if %{force_sound_aplay}
 %patch0 -p1 -b .aplay
 %endif
-%patch1 -p1 -b .nm09
 
 ## Patches 100+: To be Included in Future Upstream
 # not strictly going to be included upstream, but enabling MSNP16
@@ -418,6 +416,9 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 # from the official client (and possibly file transfers)
 %patch100 -p0 -b .msnp16
 
+# http://developer.pidgin.im/ticket/13505
+%patch101 -p1 -b .nm09
+
 # Our preferences
 cp %{SOURCE1} prefs.xml
 
@@ -679,6 +680,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Mar 25 2011 Dan Williams <dcbw at redhat.com> 2.7.11-2
+- Rebuild for NetworkManager 0.9
+
 * Fri Mar 11 2011 Stu Tomlinson <stu at nosnilmot.com> 2.7.11-1
 - 2.7.11, includes security/DoS fixes in Yahoo protocol
   CVE-2011-1091 (#683031)