[pidgin] Patch upstreamed.

Jon Ciesla limb at fedoraproject.org
Wed May 30 19:32:00 UTC 2012


commit 3d38dd1f503ae4e8d273a43854257e69f2afac07
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed May 30 14:31:48 2012 -0500

    Patch upstreamed.

 pidgin.spec |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/pidgin.spec b/pidgin.spec
index 88da338..158d559 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -145,7 +145,7 @@ Patch0:         pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 #Patch100:       pidgin-2.7.7-msn-disable-msnp16.patch
 #Patch101:       nm09-more.patch
 #Patch102:       pidgin-2.10.1-fix-msn-ft-crashes.patch
-Patch103:       port-to-farstream.patch
+#Patch103:       port-to-farstream.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Summary:        A Gtk+ based multiprotocol instant messaging client
@@ -441,7 +441,7 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 #%patch102 -p0 -R -b .ftcrash
 
 %if 0%{?fedora} >= 17
-%patch103 -p1 -b .farstream
+#%patch103 -p1 -b .farstream
 %endif
 
 # Our preferences
@@ -707,6 +707,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed May 30 2012 Jon Ciesla <limburgher at gmail.com> - 2.10.4-1
 - Update to 2.10.4, CVE-2012-2214, CVE-2012-2318, BZ 806839, 819454.
+- Port to farstream patch upstreamed.
 
 * Wed May 02 2012 Milan Crha <mcrha at redhat.com> - 2.10.2-2
 - Rebuild against newer evolution-data-server


More information about the scm-commits mailing list