rpms/bzr-gtk/EL-5 bzr-gtk-more-better-seahorse-dbus-check.patch, NONE, 1.1 bzr-gtk.spec, 1.16, 1.17

[Toshio くらとみ (toshio)]

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24076/EL-5

Modified Files:
	bzr-gtk.spec 
Added Files:
	bzr-gtk-more-better-seahorse-dbus-check.patch 
Log Message:

* Wed May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-2
- Add patch from upstream to fix all bzr-gtk commands when seahorse
  isn't present. launchpad #228922.


bzr-gtk-more-better-seahorse-dbus-check.patch:

--- NEW FILE bzr-gtk-more-better-seahorse-dbus-check.patch ---
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: iacobs at m0n5t3r.info-20080523082359-wsbcvw5khcasf53b
# target_branch: file:///home/iacobs/tmp/bzr-gtk/
# testament_sha1: ed3fcbe8c1a318583647d8e055cb1f9813212e98
# timestamp: 2008-05-23 11:24:09 +0300
# base_revision_id: jelmer at samba.org-20080504202356-64wc0mcpsqd708xq
# 
# Begin patch
=== modified file 'seahorse.py'
--- seahorse.py	2008-05-01 21:49:50 +0000
+++ seahorse.py	2008-05-23 08:23:59 +0000
@@ -28,21 +28,17 @@
 KEY_TYPE_OPENPGP = 'openpgp'
 KEY_TYPE_SSH = 'ssh'
 
-try:
-    dbus.validate_bus_name(BUS_NAME)
-except ValueError:
-    # Seahorse isn't installed
-    raise ImportError
-except AttributeError:
-    # Outdated version of DBus that doesn't have validate_bus_name
-    raise ImportError
-
 bus = dbus.SessionBus()
 
-crypto = dbus.Interface(bus.get_object(BUS_NAME, CRYPTO_PATH), 
-                        CRYPTO_INTERFACE)
-openpgp = dbus.Interface(bus.get_object(BUS_NAME, OPENPGP_PATH),
-                         OPENPGP_INTERFACE)
+try: 
+    crypto = dbus.Interface(bus.get_object(BUS_NAME, CRYPTO_PATH), 
+                            CRYPTO_INTERFACE)
+    openpgp = dbus.Interface(bus.get_object(BUS_NAME, OPENPGP_PATH),
+                             OPENPGP_INTERFACE)
+except dbus.exceptions.DBusException, e:
+    if e.get_dbus_name() == 'org.freedesktop.DBus.Error.ServiceUnknown':
+        raise ImportError
+    raise
 
 FLAG_VALID = 0x0001
 FLAG_CAN_ENCRYPT = 0x0002

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT2vVE0AAwR/gEQQAGBR5///
f+PeIL////BQBc9IAAUAAADwlNU0FPU9EfqnqDymj1PUAAAAGnqNpqaD1DjJkyYjEwAmTBMgBowj
AEMBxkyZMRiYATJgmQA0YRgCGAjSiZBkNB6mIaGgBpoBpoAaAaAVSJoTQyAAQ0EaaaU/KGKfok0Y
R5J6m1HjEbGnrUU1B45ckt55EGIwV0QwOpmGhBDTiKivOVSiLpQUpmpoVurnZYq1XxGGEwxRGR25
s7ifNnECSRbYxmhJAQ8EJNOhyiouwvyzGw5EA8w/EWaNrpy8ktcOEbaJUCvgA3T83ukpKTPK3XKO
qdKquVWwilKNKiDi5t8pbdqSqPTJLa8vzdKi7gaj6l4d8Y3tRH8vUjXVOfd2Fm1PHrmog4lTabTh
w1abJzn8UObRLEJyJyl46HTTodRQ8RFpZOKTrJRbvVFJIWkkXLKKCKkWRaxFfsqeEfYhRD4L0LZs
Zjxd7wxEL0KXIrW/HGszb5T1PdM+ZksL0770mTBlnJyoa08kYyp1thDHPUIujV54MrCW1PmuZUKM
EdDdG5GtkycE04JMqpapkZFiFRm0KhlxM6bapCLVbEpUtwvdSFyODEkkqIV248y6KFCeRkkoirOr
Z21wirFeamRpZSWkyasLpIjZSZliSMuJ6kamtfH4oTZ1jGVo0pPujt7CGVRdFzYxOCbUzuUa6LFk
NLGmRnXZYx0hYyob25pXLGJmTRrZGNjcy3JjpxpehFKTRUoqZ1aS5ordN7NF1xoaGNx45cIsjC4n
ciVbCtqZciWpjV42db6dtlcosZ6onEzEilxdEV9Rx9X5FaRHvSPPgzvBmmxk/WkqcY65JSia3k+R
sZ1StMSCHDiAYJQxnyWkT2QybtOuxvc9XnUWGQlmPq3WaPorVvsxxYyqmD6P4stVvq1vs/lc0vs4
sLWDM/s4aV9PslPZW6USiNtSpP9edEpOz0JUH4MTxe54v0UVtnx+D9dT5vR5+t8kGll2HlETiSnf
Q3w3K2CGjIhpR84dNb9kj0cEknJ8lpw4Wtbi0o/4bY0MFySD1L4/JL0fhB/mLz0druRrdGD9EnP+
uh9SxTsxIW1NkyFHKPzbn7WNCJau91sbrYQ3oWuiLHNcixnG5c0R8f3Q8GF+c9Z1cTs7Xf0zyOVT
Cijb41vWnfKmCtwb2PctZT+DFyPax4K4i9vd2iNET/pizss3764wLDDf90VoWmzVY1EmbEPPmW2I
1xjDr93BkRYxaWcvRpe17GVJrMxcfRmYOvpiCcNHkyQ7HbEKRj3f0+rlGsfRGSq6MyOFSGxDy+zz
eZK6JJxLT2S2PcMh58TfyRQn4NURp4IPy6VSxuYpIiTczhs7V9jxwbdsncd/KL0vJG6I3/gZfJC/
zqRNDuRrdiHqZjuWLjk+6C07IXHhEoWnc5rzkzrG8+NcUfCRjISI29ZquWxFaUQZn6eXrtsZU0Wy
Qkjs6pIOpekg2e+ax7JREdiSvF4TQnEdngf9yw98eSxGi3VPk39LpdKKFcFs7u61aSa43fIlEtCP
H3HsibrQ4ntz1fB0KpoMgnEcvv5KuXWuQ1PNxbEkVMjFCVs4dE945v2VlhKUJFknCHHokj4zsWEm
hBWq4HuPFHqXxo/F27USNRYEl+RGqJopXEeBK2vv1JnvQ5kO95LTPljuNaSWZuajE4YiovjIloui
MUR0yLZI1JndWcXNP81UJStRZoDMbEetHzjT5owtdMtBvgyCxMkggkEiMBADZiWJkkqBfxdyRThQ
kD2vVE0=


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/EL-5/bzr-gtk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bzr-gtk.spec	7 May 2008 20:31:09 -0000	1.16
+++ bzr-gtk.spec	30 May 2008 16:58:34 -0000	1.17
@@ -8,7 +8,7 @@
 
 Name:           bzr-gtk
 Version:        0.94.0
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
@@ -21,6 +21,8 @@
 # for now.
 Patch1:         bzr-gtk-disable-nautilus-pull.patch
 Patch2:         bzr-gtk-nautilus-setup.patch
+# https://bugs.launchpad.net/bzr-gtk/+bug/228922
+Patch3:         bzr-gtk-more-better-seahorse-dbus-check.patch
 %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
@@ -67,8 +69,10 @@
 %patch0 -p1 -b .disable
 %patch1 -p1 -b .nautilusdisable
 %patch2 -p1 -b .nautilusinstall
+%patch3 -p0 -b .seahorse-fix
+
 %if 0%{?fedora} <= 7
-# EPEL and Fedora < 7
+# EPEL 5 and Fedora <= 7
 %patch100 -p1 -b .encoding
 %endif
 
@@ -120,6 +124,10 @@
 %endif
 
 %changelog
+* Wed May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-2
+- Add patch from upstream to fix all bzr-gtk commands when seahorse
+  isn't present. launchpad #228922.
+
 * Wed May 7 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94-1.1
 - Add Encoding metadata for EL-5/F-7 desktop-file-validate.