[gajim/f14] Upstream bugfix release. Dropped a merged patch.

[Michal Schmidt]

commit 727bfcec4bee9c4e75dbc8066234c81782b643fd
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Thu Jun 9 01:27:13 2011 +0200

    Upstream bugfix release.
    Dropped a merged patch.

 .gitignore                   |    1 +
 gajim-0.14-check-error.patch |   37 -------------------------------------
 gajim.spec                   |   10 ++++++----
 sources                      |    2 +-
 4 files changed, 8 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 519ee69..4be75ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ gajim-0.13.4.tar.bz2
 /gajim-0.13.90.tar.bz2
 /gajim-0.14.tar.bz2
 /gajim-0.14.1.tar.bz2
+/gajim-0.14.2.tar.bz2
diff --git a/gajim.spec b/gajim.spec
index 5cc7a72..145ecf1 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,8 +1,8 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
 %global		majorver 0.14
-Version:	0.14.1
-Release:	3%{?dist}
+Version:	0.14.2
+Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
@@ -11,7 +11,6 @@ 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
-Patch4:		gajim-0.14-check-error.patch
 Patch5:		gajim-0.14-handle-read-before-close.patch
 BuildArch:	noarch
 
@@ -65,7 +64,6 @@ Gajim does not require GNOME to run, even though it exists with it nicely.
 %setup -q
 %patch0 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 
 %build
@@ -120,6 +118,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/%{name}/src
 
 %changelog
+* Thu Jun 09 2011 Michal Schmidt <mschmidt at redhat.com> 0.14.2-1
+- Upstream bugfix release.
+- Dropped a merged patch.
+
 * Mon Nov 15 2010 Michal Schmidt <mschmidt at redhat.com> 0.14.1-3
 - Fix a regression noted by Peter Lemenkov in Bodhi.
   (Could not connect to gmail.com)
diff --git a/sources b/sources
index e44e474..c18e676 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5e421da6eef7bb5e802231d93cb090f  gajim-0.14.1.tar.bz2
+03c34227174dc0db021b82cd58fb95a8  gajim-0.14.2.tar.bz2