[pidgin/f15/master] clarify status of the NM 0.9 patch and add link to trac issue for it

Daniel Williams dcbw at fedoraproject.org
Mon Mar 14 16:14:16 UTC 2011


commit a172d1d7d32f78fded19861f7cdf48f1824ab891
Author: Dan Williams <dcbw at redhat.com>
Date:   Mon Mar 14 11:15:23 2011 -0500

    clarify status of the NM 0.9 patch and add link to trac issue for it

 pidgin.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/pidgin.spec b/pidgin.spec
index 8c59406..02290d7 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -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
 


More information about the scm-commits mailing list