diff --git a/gajim-0.14-check-error.patch b/gajim-0.14-check-error.patch deleted file mode 100644 index 8bffbc3..0000000 --- a/gajim-0.14-check-error.patch +++ /dev/null @@ -1,37 +0,0 @@ -check error before incoming or outgoing events - -https://bugzilla.redhat.com/show_bug.cgi?id=649986 -http://trac.gajim.org/ticket/5991 - -diff -r c47219e5a552 -r ba5c2eb1f1e7 src/common/xmpp/idlequeue.py ---- a/src/common/xmpp/idlequeue.py Mon Oct 25 20:09:30 2010 +0200 -+++ b/src/common/xmpp/idlequeue.py Mon Oct 25 21:06:45 2010 +0200 -@@ -388,20 +388,22 @@ - self.unplug_idle(fd) - return False - -+ if flags & IS_CLOSED: -+ # io error, don't expect more events -+ self.remove_timeout(obj.fd) -+ self.unplug_idle(obj.fd) -+ obj.pollend() -+ return False -+ - if flags & PENDING_READ: - #print 'waiting read on %d, flags are %d' % (fd, flags) - obj.pollin() - return True - -- elif flags & PENDING_WRITE: -+ if flags & PENDING_WRITE: - obj.pollout() - return True - -- elif flags & IS_CLOSED: -- # io error, don't expect more events -- self.remove_timeout(obj.fd) -- self.unplug_idle(obj.fd) -- obj.pollend() - return False - - def process(self): diff --git a/gajim.spec b/gajim.spec index 6231a90..f5d2db0 100644 --- a/gajim.spec +++ b/gajim.spec @@ -1,14 +1,13 @@ Summary: Jabber client written in PyGTK Name: gajim %global majorver 0.14 -Version: 0.14.1 -Release: 4%{?dist} +Version: 0.14.2 +Release: 1%{?dist} License: GPLv3 Group: Applications/Internet URL: http://gajim.org/ Source0: http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2 Patch0: gajim-0.13.90-pygtk-crash-python2.7-workaround.patch -Patch4: gajim-0.14-check-error.patch Patch5: gajim-0.14-handle-read-before-close.patch BuildArch: noarch @@ -60,7 +59,6 @@ Gajim does not require GNOME to run, even though it exists with it nicely. %prep %setup -q %patch0 -p1 -%patch4 -p1 %patch5 -p1 %build @@ -115,6 +113,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/%{name}/src %changelog +* Thu Jun 09 2011 Michal Schmidt 0.14.2-1 +- Upstream bugfix release. +- Dropped a merged patch. + * Tue Feb 08 2011 Fedora Release Engineering - 0.14.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild