[gajim/f14/master] 0.14.1-1

[Michal Schmidt]

commit c7b9f2e008503e613eb9ac87cf330eca636aabf4
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Oct 26 22:46:50 2010 +0200

    0.14.1-1
    
    dropped merged patches

 ...andle-canceling-of-creating-gnome-keyring.patch |   21 ----------------
 ...k-when-receiving-strange-reply-to-iq_last.patch |   25 --------------------
 gajim.spec                                         |   14 +++++-----
 3 files changed, 7 insertions(+), 53 deletions(-)
---
diff --git a/gajim.spec b/gajim.spec
index b0de475..4dac1c9 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,15 +1,13 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
 %global		majorver 0.14
-Version:	0.14
-Release:	4%{?dist}
+Version:	0.14.1
+Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
-Patch0:		gajim-handle-canceling-of-creating-gnome-keyring.patch
-Patch1:		gajim-prevent-traceback-when-receiving-strange-reply-to-iq_last.patch
-Patch2:		gajim-0.13.90-pygtk-crash-python2.7-workaround.patch
+Patch0:		gajim-0.13.90-pygtk-crash-python2.7-workaround.patch
 # libasyncns triggers a kernel bug (RHBZ#529202), so let's not use it until
 # it's fixed.
 Patch3:		gajim-0.14-disable-libasyncns.patch
@@ -64,8 +62,6 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 %build
@@ -120,6 +116,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}/src
 
 %changelog
+* Tue Oct 26 2010 Michal Schmidt <mschmidt at redhat.com> 0.14.1-1
+- Upstream bugfix release.
+- Dropped merged patches.
+
 * Tue Sep 21 2010 Michal Schmidt <mschmidt at redhat.com> 0.14-4
 - Replace our gnome-keyring patch with one picked from upstream hg.
 - Prevent traceback when receiving strange reply to iq:last.