rpms/bzr-gtk/devel bug377476.diff,NONE,1.1 bzr-gtk.spec,1.39,1.40

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13994

Modified Files:
	bzr-gtk.spec 
Added Files:
	bug377476.diff 
Log Message:
* Wed May 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.95.0-5
- Upstream patch to work around: bz#498138


bug377476.diff:

--- NEW FILE bug377476.diff ---
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: szilveszter.farkas at gmail.com-20090526081112-\
#   wd3ipahenbesmosz
# target_branch: file:///home/szilveszter/Development/Bazaar/bzr-\
#   gtk/trunk/
# testament_sha1: 7b454a8dd9ae6019ed9bc89a19472a5fe80183ec
# timestamp: 2009-05-26 10:20:59 +0200
# base_revision_id: v.ladeuil+lp at free.fr-20090511134633-\
#   zhtopap2bn9vjtpc
# 
# Begin patch
=== modified file 'seahorse.py'
--- seahorse.py	2008-08-05 13:56:46 +0000
+++ seahorse.py	2009-05-26 08:11:12 +0000
@@ -49,7 +49,8 @@
     # DBus sometimes fails like this, just treat it as if seahorse is not
     # available rather than crashing.
     if name in ("org.freedesktop.DBus.Error.Spawn.ExecFailed", 
-                "org.freedesktop.DBus.Error.ServiceUnknown"):
+                "org.freedesktop.DBus.Error.ServiceUnknown",
+                "org.freedesktop.DBus.Error.Spawn.ChildExited"):
         raise ImportError
     else:
         raise

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWf0eHEAAAW5fgAAUUW///18A
ngC////wUAO6eaubcbo3bbdcJJJpNT0yaTyZE/Um0nqT1HiaPUDQJ7VNHqCUQU8p4UwUAMjT1DTQ
AAAAlNQmQU9MRPQRpkaaAaANNAAcwCYATAACYAAmAAJJCaAmmSZpqGyCZQB+lA9Rppo8pgu4DJtw
/xilbJphNQs1qc8DJjdGumFgEx8RuNkkJvniYPxDTD3FM/nhP7TTNfx+ennjc5n43B8MEOqvdXZj
9ZoambPlq4JP6s0QXDI5WnCzkmo0FJhBSiqi1nKsTk1vHSRNxQZ0mSrW4/ydvNJfzRT3RuylFY1u
A8cCgMTehKcFEc4Ug8e2sWX8HoJCconCQ51HkydOat4aZp2ZkR0orLSBMy86hbwkWZaE8ra06qIt
XSL7FoKzJ5SZyIt04oFRmJAgSm1ONRG58SgL2jykGEW6McbomUZWCKSuLmsrqHacxCMirHUzhUe1
gkCg2FK1yl09nMYVIPXCYkGtCybyhcWJRhkIxlUYbUJDclskcYlH2IgtwwzGsIyg4myyCCyi8eaz
Ysnk1FbMUqFRYEjG8x+ZMwsmPCnZK5O473JWubh8jVzvi4inPpZ7NPCpMjb6otNCIe8zzARv/fnh
hHIzZcTWXUT2OzJgarysjNRA2kZWMaTYX92qQoiWQ1BGJ5uS8b6imSRS3uFhvS42slOsjRYiGg/R
Wd5A+zeZhdMi7OzaGR5wKS8eQ/vOeKdtqVnhlmVHYWYoT006NhSpRlrPoWF9p0m4QdOnufmOXKvE
/BPpOSMnhq+K81SMVkORypeTMojdSKhGIGu1k9gK6yJUK1UgPVIGyhSWdiI43m1LQQKj9YU3spV1
THnDOYbRRS/veXhNILsMeniq1rqvavoiBpLFQBgXKkCJp5hmf11vkh3AcxWgfAxhxxJF3lwGoM83
eSmsQybWtbl2sQ081dTGB5Hclcb0qlsmL7ZTNRhGjImgbGWvCzhtBnGnkEEWbo6pBMmE2uV2gCCD
jhBhMKZwZEy9h8YLULfU0jlaukmxW5xRTtOmC8DIpSQKLujoGnM9HrsW0tI47FORCGRb9PRuiNX1
32Jn0FMpAPbE/CGc3ExISZNpJy8hQJ7J3kTGPgqjxAaYlTIIBtGqF10E6aIFUlhy2wNPSXLaYgW7
ZGeA0lRWMvMUoFU7kVIqlWGh5ovWD/yXXllK0AUzgeaeW+4WmYjiMprpU5zcGM4pcxjW56UrAf8X
ckU4UJD9HhxA

Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- bzr-gtk.spec	24 Feb 2009 06:16:34 -0000	1.39
+++ bzr-gtk.spec	27 May 2009 17:45:31 -0000	1.40
@@ -8,7 +8,7 @@
 
 Name:           bzr-gtk
 Version:        0.95.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
@@ -18,6 +18,8 @@ Source0:        http://samba.org/~jelmer
 # This requires some nonexistent functionality.  Bug filed upstream.  Disabled
 # for now.
 Patch0:         bzr-gtk-disable-nautilus-pull.patch
+# Fix for seahorse traceback from upstream
+Patch1: bug377476.diff
 %if 0%{?fedora} <= 7
 # In EL-5 and Fedora < 7 Encoding was a mandatory field.  Now it's deprecated.
 Patch100:       bzr-gtk-el5-encoding.patch
@@ -66,6 +68,7 @@ from within Nautilus.
 %prep
 %setup -q
 %patch0 -p1 -b .nautilusdisable
+%patch1 -p0 -b .seahorse
 
 %if 0%{?fedora} <= 7
 # EPEL 5 and Fedora <= 7
@@ -125,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed May 27 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.95.0-5
+- Upstream patch to work around: bz#498138
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.95.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild