rpms/gajim/EL-5 gajim-keyring.diff,NONE,1.1 gajim.spec,1.17,1.18

[Michal Schmidt]

Author: michich

Update of /cvs/pkgs/rpms/gajim/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31597

Modified Files:
	gajim.spec 
Added Files:
	gajim-keyring.diff 
Log Message:
* Wed Mar 11 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.1-1.el5.2
- Took the current version of Gajim and modified the spec for EL-5.
- Added workaround for a gnomekeyring binding bug.


gajim-keyring.diff:

--- NEW FILE gajim-keyring.diff ---
Workaround a bug in gnomekeyring python binding causing a crash on startup.
Such a workaround was in upstream between SVN revisions 7321 and 9575.
For more information see:
 http://trac.gajim.org/ticket/2595 
 http://bugzilla.gnome.org/show_bug.cgi?id=363019

Index: src/common/passwords.py
===================================================================
--- src/common/passwords.py.orig
+++ src/common/passwords.py
@@ -54,9 +54,10 @@ class SimplePasswordStorage(PasswordStor
 
 class GnomePasswordStorage(PasswordStorage):
 	def __init__(self):
-		self.keyring = gnomekeyring.get_default_keyring_sync()
-		if self.keyring is None:
-			self.keyring = 'default'
+		#self.keyring = gnomekeyring.get_default_keyring_sync()
+ 		## above line commented and code below inserted as workaround
+ 		## for the bug http://bugzilla.gnome.org/show_bug.cgi?id=363019
+ 		self.keyring = "default"
 		try:
 			gnomekeyring.create_sync(self.keyring, None)
 		except gnomekeyring.AlreadyExistsError:


Index: gajim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gajim/EL-5/gajim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gajim.spec	11 Mar 2009 16:21:51 -0000	1.17
+++ gajim.spec	11 Mar 2009 17:02:12 -0000	1.18
@@ -3,11 +3,12 @@
 Summary:	Jabber client written in PyGTK
 Name:		gajim
 Version:	0.12.1
-Release:	1%{?dist}.1
+Release:	1%{?dist}.2
 License:	GPLv2
 Group:		Applications/Internet
 URL:		http://gajim.org/
 Source0:	http://gajim.org/downloads/%{name}-%{version}.tar.gz
+Patch0:		%{name}-keyring.diff
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -49,6 +50,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 # Suppress error.
 sed --in-place --expression '1d' ./src/gajim.py
@@ -107,8 +109,9 @@
 %{python_sitearch}/%{name}/trayicon.so
 
 %changelog
-* Wed Mar 11 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.1-1.el5.1
+* Wed Mar 11 2009 Michal Schmidt <mschmidt at redhat.com> - 0.12.1-1.el5.2
 - Took the current version of Gajim and modified the spec for EL-5.
+- Added workaround for a gnomekeyring binding bug.
 
 * Tue Dec 23 2008 Debarshi Ray <rishi at fedoraproject.org> - 0.12.1-1
 - Version bump to 0.12.1.