From 2d90de01f8107b72481dfabb5bcc298b7468a2d5 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <michich@fedoraproject.org>
Date: Mar 28 2010 20:46:49 +0000
Subject: - Update to current gajim_0.13 branch to fix contact syncing (RHBZ#577534).


---

diff --git a/.cvsignore b/.cvsignore
index 99e0324..11836e3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gajim-0.13.3.tar.bz2
+gajim-0.13-hg11989.tar.bz2
diff --git a/gajim.spec b/gajim.spec
index cb3f522..e3c118d 100644
--- a/gajim.spec
+++ b/gajim.spec
@@ -1,12 +1,16 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
 %global		majorver 0.13
-Version:	0.13.3
-Release:	3%{?dist}
+Version:	0.13.4
+Release:	0.1.20100328hg%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
-Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
+#Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
+# This tarball was generated using:
+# hg clone http://hg.gajim.org/gajim gajim
+# cd gajim && hg up -r 11989 && hg archive -t tbz2 /tmp/gajim-0.13-hg11989.tar.bz2
+Source0:	gajim-0.13-hg11989.tar.bz2
 Patch0:		gajim-0.13.3-gnome-keyring-CancelledError.patch
 BuildArch:	noarch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -41,16 +45,20 @@ BuildRequires:	intltool
 BuildRequires:	pygtk2-devel
 BuildRequires:	hardlink
 
+# only for the pre-release version from hg:
+BuildRequires:	autoconf automake libtool
+
 %description
 Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is
 to provide a full featured and easy to use xmpp client for the GTK+ users.
 Gajim does not require GNOME to run, even though it exists with it nicely.
 
 %prep
-%setup -q
+%setup -q -n gajim-0.13-hg11989
 %patch0 -p1
 
 %build
+./autogen.sh 
 %configure --docdir=%{_docdir}/%{name}-%{version} \
   --disable-static --disable-trayicon
 
@@ -95,6 +103,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/src
 
 %changelog
+* Sun Mar 28 2010 Michal Schmidt <mschmidt@redhat.com> 0.13.4-0.1.20100328hg
+- Update to current gajim_0.13 branch to fix contact syncing (RHBZ#577534).
+
 * Mon Mar 15 2010 Michal Schmidt <mschmidt@redhat.com> 0.13.3-3
 - What the trayicon really needs is gnome-python2-libegg (RHBZ#573358).
 
diff --git a/sources b/sources
index 74b2dc5..7882d6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bedbc32147558207a3d9476d8b632fbb  gajim-0.13.3.tar.bz2
+dee0f2c113978469078ec96787345491  gajim-0.13-hg11989.tar.bz2