rpms/gnome-keyring/devel init-ret.patch, NONE, 1.1 gnome-keyring.spec, 1.48, 1.49

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-keyring/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6806

Modified Files:
	gnome-keyring.spec 
Added Files:
	init-ret.patch 
Log Message:
backport a fix from svn


init-ret.patch:

--- NEW FILE init-ret.patch ---
diff -up gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c.init-retval gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c
--- gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c.init-retval	2007-07-30 13:26:41.000000000 -0400
+++ gnome-keyring-2.19.6/daemon/gnome-keyring-daemon-ops.c	2007-07-30 13:27:12.000000000 -0400
@@ -1495,7 +1495,7 @@ op_get_item_info (GkrBuffer *packet, Gkr
 	GkrKeyringItem *item;
 	GnomeKeyringOpCode opcode;
 	guint32 item_id, flags;
-	gboolean ret;
+	gboolean ret = TRUE;
 	GnomeKeyringResult res;
 	
 	if (!gnome_keyring_proto_decode_get_item_info (packet, &opcode, &keyring_name,


Index: gnome-keyring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-keyring/devel/gnome-keyring.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gnome-keyring.spec	27 Jul 2007 23:02:54 -0000	1.48
+++ gnome-keyring.spec	30 Jul 2007 17:43:12 -0000	1.49
@@ -3,12 +3,14 @@
 Summary: A framework for managing user passwords and other secrets
 Name: gnome-keyring
 Version: 2.19.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL/LGPL
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gnome-keyring/2.19/gnome-keyring-%{version}.tar.bz2
 # http://bugzilla.gnome.org/show_bug.cgi?id=461045
 Patch0: pam.patch
+# fixed in upstream svn
+Patch1: init-ret.patch
 URL: http://www.gnome.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -57,6 +59,7 @@
 %prep
 %setup -q -n gnome-keyring-%{version}
 %patch0 -p1 -b .pam
+%patch1 -p1 -b .init-ret
 
 %build
 aclocal
@@ -101,6 +104,9 @@
 
 
 %changelog
+* Mon Jul 30 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-2
+- Backport a fix from upstream
+
 * Fri Jul 27 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.6-1
 - Update to 2.19.6
 - Add a pam subpackage