rpms/gajim/F-13 .cvsignore, 1.19, 1.20 gajim.spec, 1.41, 1.42 sources, 1.19, 1.20

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/gajim/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15418

Modified Files:
	.cvsignore gajim.spec sources 
Log Message:
* Sun Mar 28 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.4-0.1.20100328hg
- Update to current gajim_0.13 branch to fix contact syncing (RHBZ#577534).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-13/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	8 Mar 2010 17:20:25 -0000	1.19
+++ .cvsignore	28 Mar 2010 20:49:39 -0000	1.20
@@ -1 +1 @@
-gajim-0.13.3.tar.bz2
+gajim-0.13-hg11989.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-13/gajim.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- gajim.spec	15 Mar 2010 14:31:54 -0000	1.41
+++ gajim.spec	28 Mar 2010 20:49:39 -0000	1.42
@@ -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
 # libasyncns triggers a kernel bug (RHBZ#529202), so let's not use it until
 # it's fixed.
@@ -45,17 +49,21 @@ 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
 %patch1 -p1
 
 %build
+./autogen.sh 
 %configure --docdir=%{_docdir}/%{name}-%{version} \
   --disable-static --disable-trayicon
 
@@ -100,6 +108,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/src
 
 %changelog
+* Sun Mar 28 2010 Michal Schmidt <mschmidt at 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 at redhat.com> 0.13.3-3
 - What the trayicon really needs is gnome-python2-libegg (RHBZ#573358).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-13/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	8 Mar 2010 17:20:27 -0000	1.19
+++ sources	28 Mar 2010 20:49:39 -0000	1.20
@@ -1 +1 @@
-bedbc32147558207a3d9476d8b632fbb  gajim-0.13.3.tar.bz2
+dee0f2c113978469078ec96787345491  gajim-0.13-hg11989.tar.bz2