rpms/gajim/F-12 gajim-0.13.3-gnome-keyring-CancelledError.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 gajim.spec, 1.37, 1.38 sources, 1.18, 1.19

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/gajim/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5925

Modified Files:
	.cvsignore gajim.spec sources 
Added Files:
	gajim-0.13.3-gnome-keyring-CancelledError.patch 
Log Message:
* Mon Mar 08 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.3-1
- Update to 0.13.3.
- Add gajim-0.13.3-gnome-keyring-CancelledError.patch (RHBZ#556374).


gajim-0.13.3-gnome-keyring-CancelledError.patch:
 passwords.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gajim-0.13.3-gnome-keyring-CancelledError.patch ---
Newer gnome-keyring may raise CancelledError

In such case let's continue without the keyring instead of crashing.


  Patch attached to upstream trac ticket:
  http://trac.gajim.org/ticket/5633
  https://bugzilla.redhat.com/show_bug.cgi?id=556374
    -- Michal

Index: gajim-0.13.3/src/common/passwords.py
===================================================================
--- gajim-0.13.3.orig/src/common/passwords.py
+++ gajim-0.13.3/src/common/passwords.py
@@ -197,7 +197,7 @@ def get_storage():
 		if USER_USES_GNOMEKEYRING:
 			try:
 				storage = GnomePasswordStorage()
-			except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError):
+			except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError, gnomekeyring.CancelledError):
 				storage = None
 		if storage is None:
 			if gajim.config.get('use_kwalletcli'):


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-12/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	19 Sep 2009 13:32:42 -0000	1.17
+++ .cvsignore	8 Mar 2010 17:22:56 -0000	1.18
@@ -1 +1 @@
-gajim-0.12.5.tar.bz2
+gajim-0.13.3.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-12/gajim.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gajim.spec	5 Feb 2010 14:28:36 -0000	1.37
+++ gajim.spec	8 Mar 2010 17:22:56 -0000	1.38
@@ -1,12 +1,13 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
 %global		majorver 0.13
-Version:	0.13.2
+Version:	0.13.3
 Release:	1%{?dist}
 License:	GPLv3
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{majorver}/%{name}-%{version}.tar.bz2
+Patch0:		gajim-0.13.3-gnome-keyring-CancelledError.patch
 BuildArch:	noarch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -46,6 +47,7 @@ Gajim does not require GNOME to run, eve
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version} \
@@ -92,6 +94,10 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/src
 
 %changelog
+* Mon Mar 08 2010 Michal Schmidt <mschmidt at redhat.com> 0.13.3-1
+- Update to 0.13.3.
+- Add gajim-0.13.3-gnome-keyring-CancelledError.patch (RHBZ#556374).
+
 * Fri Feb 05 2010 Michal Schmidt <mschmidt at redhat.com> - 0.13.2-1
 - Version bump to 0.13.2. (RHBZ#541470)
 - 0.13.1 and 0.13.2 are bugfix releases.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/F-12/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	5 Feb 2010 14:28:37 -0000	1.18
+++ sources	8 Mar 2010 17:22:56 -0000	1.19
@@ -1 +1 @@
-91606788f4d846b2d9c48abf8ec0781c  gajim-0.13.2.tar.bz2
+bedbc32147558207a3d9476d8b632fbb  gajim-0.13.3.tar.bz2