- Removed dbus patch, included upstream

Changed files:
    bzr-gtk-dbus_detection_fix.patch -> 1.2
    bzr-gtk.spec -> 1.28

diff --git a/bzr-gtk-dbus_detection_fix.patch b/bzr-gtk-dbus_detection_fix.patch
deleted file mode 100644 (file)
index 8944bc5..0000000
--- a/bzr-gtk-dbus_detection_fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'seahorse.py'
---- old/seahorse.py    2008-07-23 00:07:09 +0000
-+++ new/seahorse.py    2008-08-05 13:55:03 +0000
-@@ -40,6 +40,12 @@
-         name = get_name()
-     else:
-         name = getattr(e, '_dbus_error_name', None)
-+        
-+    if name is None:
-+        args = getattr(e, 'args', None) # This is case for old python-dbus-0.62
-+        if args == ("Unable to determine the address of the message bus (try 'man dbus-launch' and 'man dbus-daemon' for help)",):
-+            raise ImportError
-+        
-     # 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", 
-

diff --git a/bzr-gtk.spec b/bzr-gtk.spec
index 150aef08db59e14cf3dbf603727175e326191ea0..915372ec33bdc0ece5d4393e2ef152d1aa064bee 100644 (file)
--- a/bzr-gtk.spec
+++ b/bzr-gtk.spec
@@ -13,7 +13,6 @@ Group:                Development/Version Control
 # Source0:     https://launchpad.net/bzr-gtk/%{ver}/%{version}/+download/bzr-gtk-%{version}.tar.gz
 Source0:       http://samba.org/~jelmer/bzr/%{name}-%{version}.tar.gz
 # Source0-md5: 68354924f3104ab1ba7efc8bfe15ae0b
-Patch0:                %{name}-dbus_detection_fix.patch
 URL:           http://bazaar-vcs.org/bzr-gtk
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig
@@ -51,7 +50,6 @@ Bazaar. Dostępnymi poleceniami są:
 
 %prep
 %setup -q
-#%patch0 -p1
 
 %build
 %{__python} setup.py build