[pidgin] Fix IRC support

jsynacek jsynacek at fedoraproject.org
Mon Feb 25 08:52:30 UTC 2013


commit ee86e4a052c849f91f864ab219cbb7f8b480ebc2
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Mon Feb 25 09:51:55 2013 +0100

    Fix IRC support

 pidgin-2.10.7-link-libirc-to-libsasl2.patch |   16 ++++++++++++++++
 pidgin.spec                                 |   11 ++++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/pidgin-2.10.7-link-libirc-to-libsasl2.patch
new file mode 100644
index 0000000..067808c
--- /dev/null
+++ b/pidgin-2.10.7-link-libirc-to-libsasl2.patch
@@ -0,0 +1,16 @@
+Upstream ticket: #15517
+URL: https://developer.pidgin.im/ticket/15517
+Resolves: #914794
+
+diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am
+--- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am	2013-02-14 02:44:47.000000000 +0200
++++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am	2013-02-14 02:49:58.000000000 +0200
+@@ -27,7 +27,7 @@ else
+ st =
+ pkg_LTLIBRARIES   = libirc.la
+ libirc_la_SOURCES = $(IRCSOURCES)
+-libirc_la_LIBADD  = $(GLIB_LIBS)
++libirc_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS)
+ 
+ endif
+ 
diff --git a/pidgin.spec b/pidgin.spec
index 22f0dea..a57b47c 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -119,7 +119,7 @@
 
 Name:           pidgin
 Version:        2.10.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -157,6 +157,7 @@ Patch0:         pidgin-NOT-UPSTREAM-2.5.2-rhel4-sound-migration.patch
 
 ## Patches 100+: To be Included in Future Upstream
 Patch100:       pidgin-2.10.1-fix-msn-ft-crashes.patch
+Patch101:       pidgin-2.10.7-link-libirc-to-libsasl2.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Summary:        A Gtk+ based multiprotocol instant messaging client
@@ -450,6 +451,8 @@ echo "FEDORA=%{fedora} RHEL=%{rhel}"
 
 # http://pidgin.im/pipermail/devel/2011-November/010477.html
 %patch100 -p0 -R -b .ftcrash
+# https://developer.pidgin.im/ticket/15517
+%patch101 -p1 -b .irc-sasl
 
 # Our preferences
 cp %{SOURCE1} prefs.xml
@@ -513,6 +516,9 @@ SWITCHES="--with-extraversion=%{release}"
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
 export CFLAGS="$RPM_OPT_FLAGS"
 
+# remove after irc-sasl patch has been merged upstream
+autoreconf --force --install
+
 # gnutls is buggy so use mozilla-nss on all distributions
 %configure --enable-gnutls=no --enable-nss=yes --enable-cyrus-sasl \
            --enable-tcl --enable-tk \
@@ -735,6 +741,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Feb 25 2013 Jan Synáček <jsynacek at redhat.com> - 2.10.7-2
+- Fix IRC support, BZ 914794
+
 * Wed Feb 20 2013 Jan Synáček <jsynacek at redhat.com> - 2.10.7-1
 - Update to 2.10.7, BZ 911088
 


More information about the scm-commits mailing list