rpms/bzr-gtk/devel bzr-gtk-more-better-seahorse-dbus-check.patch, 1.1, 1.2 bzr-gtk.spec, 1.29, 1.30

[Toshio くらとみ (toshio)]

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15201

Modified Files:
	bzr-gtk-more-better-seahorse-dbus-check.patch bzr-gtk.spec 
Log Message:
* Patch accepted upstream is slightly different.  Reraises the exception if it's
  not related to seahorse.


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

Index: bzr-gtk-more-better-seahorse-dbus-check.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/devel/bzr-gtk-more-better-seahorse-dbus-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzr-gtk-more-better-seahorse-dbus-check.patch	22 May 2008 00:15:57 -0000	1.1
+++ bzr-gtk-more-better-seahorse-dbus-check.patch	30 May 2008 15:47:46 -0000	1.2
@@ -1,15 +1,15 @@
 # Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: iacobs at m0n5t3r.info-20080511115723-lldd6ci1i1t3aqkz
+# revision_id: iacobs at m0n5t3r.info-20080523082359-wsbcvw5khcasf53b
 # target_branch: file:///home/iacobs/tmp/bzr-gtk/
-# testament_sha1: 46494ea36a391fc7db9733320123b571da14d056
-# timestamp: 2008-05-11 14:59:03 +0300
+# 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-11 11:57:23 +0000
-@@ -28,21 +28,16 @@
++++ seahorse.py	2008-05-23 08:23:59 +0000
+@@ -28,21 +28,17 @@
  KEY_TYPE_OPENPGP = 'openpgp'
  KEY_TYPE_SSH = 'ssh'
  
@@ -36,28 +36,34 @@
 +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
-IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcEtAgIAAaN/gEQQAGBR5///
-f+PeIL////BQA/u3ugrRQokcJIlT1PQE9Anpqaeo0yND1NGQaaADINDQ4yZMmIxMAJkwTIAaMIwB
-DAMo0p6EMmibT1NGUaAZGIYCaMENNNMGmpTRk0NpNAAAAAAAAAAJJTCAJpinkCGgmJiJ4UZpqbU8
-o8U8p6SMFoFh04+9zeQsPz9Cl14C8FGJUr0yMMCiGMiS1MyerCEccUERoI3TXpljU6QSOvEeWGQV
-ggmKQ/ld4jrfBReQresURpsa/d3bfZR63Dm1c9yWnPDCzPZE92SCCWfba3uDEh20Nhz/Y0jyfIzn
-mFYuFUcgHpfI297hDcknvkGE7wEkEgdVjoYyJ6jwClFdS0ktsMF0AtDVmgFm8sIsKJMQe4FBSjuO
-Y5F7gPF2VIacjx8kQVQpU+PbUQzNn95DuKtA1NV5RSxpeNKXgpc4KKnJZ2vNfRiJx0mCjwE8gmnH
-EB8xNETiiocSmN5e9EpHI3RZAwD7IZhxSTsOB+g0KMZyYmCywmtpSPq6QgSrqE8274FcC9ajEwKy
-o0q6BBfIYUaHkMAMjAhsjpCMjlR8gosIIgIVzUa5bTDg+HOjhNcxhJoKZxnWD/44JpyNbJjBOnJw
-hsOLqHsLrY+mgk5GpG1xNCa+yeObOXMEInI2hB0qYeR7GgisMmOoy+h+T8W/U8DyJ6T0Mo5/MgQP
-YoIlQ4sPM8oykD0MD2PUnLj2NVkpYZjrNNxW/2Gk3IbqYMXDpPB2+32BwROU7yQ6jrPCzuOfb90q
-ifMcwSDPcGdWvqFXQjuWPrmOsyHabIX++qWiY0lxSVykyWCsso2boRrVYO4mqnea/j1UHdeQpXXS
-APyX3w8Yq2U1FKvFkoJ1QQKl2eQp6MDfLzVw8rTYOKXvtebpQ7eJc/LQf2ZuU5Kq4BUYHztLVJ8E
-1Pj8ysgFeP6UETLZdG4GLJg6dhLFXqgDd5tFKjNdaXE5cVET0qp5tQEis56Eb+0T1h8euk0BTeMr
-qWAtAqPygoTWL7W+UKhRuF5QLuL5CzMllnhHKZkmxtAw4K481hpxY4T5aytsQy6inoF0yKsXGr9o
-uKwOGM5q/SUptU4ciZShw71ZqtjkdsB/YxQAwsd8vnlCDAZu/ijCkkUWQy39jJbKhksP2kig3mfH
-xuJwxB91FlMZEpOHI967PPOtgiRG9PDHGNbUucYayuWg405fFjNViHZPB0qqThr6L3BSRayblxlC
-oVENLItcmQbx4kFEZkxFtC16hdsYjZ0njtB0BxVFvVtWcgA1M6zqRPgHKNjDOMdgtgHF9ImalbS5
-msxLibKYcVlLWzhMGtiVldIbYGjdk/DkM0qjnAzGxHYTFA5DeQo1HeRQUQHgkmCMLK/4u5IpwoSG
-CWgQEA==
+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/devel/bzr-gtk.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- bzr-gtk.spec	22 May 2008 00:17:10 -0000	1.29
+++ bzr-gtk.spec	30 May 2008 15:47:46 -0000	1.30
@@ -22,7 +22,7 @@
 Patch1:         bzr-gtk-disable-nautilus-pull.patch
 Patch2:         bzr-gtk-nautilus-setup.patch
 # https://bugs.launchpad.net/bzr-gtk/+bug/228922
-Patch3:         http://launchpadlibrarian.net/14446712/bzr-gtk-more-better-seahorse-dbus-check.patch
+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
@@ -70,6 +70,7 @@
 %patch1 -p1 -b .nautilusdisable
 %patch2 -p1 -b .nautilusinstall
 %patch3 -p0 -b .seahorse-fix
+
 %if 0%{?fedora} <= 7
 # EPEL and Fedora < 7
 %patch100 -p1 -b .encoding
@@ -124,7 +125,7 @@
 
 %changelog
 * Wed May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-2
-- Add patch that might go upstream to fix all bzr-gtk commands when seahorse
+- 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