[gajim/f13/master] 0.14.1-1

[Michal Schmidt]

commit 73a3557987057c78e13a2f59c01dfe366f80057a
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Oct 26 22:51:32 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                                         |   12 ++++----
 3 files changed, 6 insertions(+), 52 deletions(-)
---
diff --git a/gajim.spec b/gajim.spec
index 5cb0986..9c62885 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,14 +1,12 @@
 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
 # libasyncns triggers a kernel bug (RHBZ#529202), so let's not use it until
 # it's fixed.
 Patch2:		gajim-0.14-disable-libasyncns.patch
@@ -63,8 +61,6 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 %build
@@ -123,6 +119,10 @@ rm -rf %{buildroot}
 %{_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.