[pidgin/f17: 3/3] Merge branch 'master' into f17

[Jon Ciesla]

commit 749c1281e8b0c2736f0542ad7057a725f04d599a
Merge: a04ff72 d2cdb00
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Mar 23 10:37:39 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	pidgin.spec

 .gitignore  |    1 +
 pidgin.spec |   26 ++++++++++++++++++--------
 sources     |    2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)
---
diff --cc pidgin.spec
index ece3639,d5dced6..e086f3c
--- a/pidgin.spec
+++ b/pidgin.spec
@@@ -433,17 -433,17 +433,21 @@@ echo "FEDORA=%{fedora} RHEL=%{rhel}
  # not strictly going to be included upstream, but enabling MSNP16
  # introduces regressions retrieving buddy icons & custom emoticons
  # from the official client (and possibly file transfers)
- %patch100 -p0 -b .msnp16
+ #%patch100 -p0 -b .msnp16
  
  # http://developer.pidgin.im/ticket/13859
- %patch101 -p1 -b .nm09more
+ #%patch101 -p1 -b .nm09more
  # http://pidgin.im/pipermail/devel/2011-November/010477.html
- %patch102 -p0 -R -b .ftcrash
+ #%patch102 -p0 -R -b .ftcrash
+ 
+ %if 0%{?fedora} >= 17
+ %patch103 -p1 -b .farstream
+ %endif
  
 +%if 0%{?fedora} >= 17
 +%patch103 -p1 -b .farstream
 +%endif
 +
  # Our preferences
  cp %{SOURCE1} prefs.xml