rpms/dstat/devel dstat-0.6.8-dbus.patch, NONE, 1.1 dstat.spec, 1.9, 1.10 dstat-0.6.7-dbus.patch, 1.1, NONE dstat-0.6.7-int.patch, 1.1, NONE

[Zdenek Prikryl]

Author: zprikryl

Update of /cvs/extras/rpms/dstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5602

Modified Files:
	dstat.spec 
Added Files:
	dstat-0.6.8-dbus.patch 
Removed Files:
	dstat-0.6.7-dbus.patch dstat-0.6.7-int.patch 
Log Message:
Updated to 0.6.8
Fixed dbus module patch


dstat-0.6.8-dbus.patch:

--- NEW FILE dstat-0.6.8-dbus.patch ---
diff -up dstat-0.6.8/plugins/dstat_dbus.py.dbus dstat-0.6.8/plugins/dstat_dbus.py
--- dstat-0.6.8/plugins/dstat_dbus.py.dbus	2007-05-12 06:09:45.000000000 +0200
+++ dstat-0.6.8/plugins/dstat_dbus.py	2008-09-16 13:26:32.000000000 +0200
@@ -16,22 +16,23 @@ class dstat_dbus(dstat):
         try:
             global dbus
             import dbus
-            try:
-                self.sysbus = dbus.Bus(dbus.Bus.TYPE_SYSTEM).get_service('org.freedesktop.DBus').get_object('/org/freedesktop/DBus', 'org.freedesktop.DBus')
-                try:
-                    self.sesbus = dbus.Bus(dbus.Bus.TYPE_SESSION).get_service('org.freedesktop.DBus').get_object('/org/freedesktop/DBus', 'org.freedesktop.DBus')
-                except:
-                    self.sesbus = None
-            except:
-                raise Exception, 'Unable to connect to dbus message bus'
-            return True
         except:
             raise Exception, 'Needs python-dbus module'
+        try:
+            self.sysbus = dbus.Interface(dbus.SystemBus().get_object('org.freedesktop.DBus', '/org/freedesktop/DBus'), 'org.freedesktop.DBus')
+        except:
+            raise Exception, 'Unable to connect to dbus message bus'
+        try:
+            self.sesbus = dbus.Interface(dbus.SessionBus().get_object('org.freedesktop.DBus', '/org/freedesktop/DBus'), 'org.freedesktop.DBus')
+        except:
+            raise True
+
+        return True
 
     def extract(self):
-        self.val['system'] = len(self.sysbus.ListServices()) - 1
+        self.val['system'] = len(self.sysbus.ListNames()) - 1
         try:
-            self.val['session'] = len(self.sesbus.ListServices()) - 1
+            self.val['session'] = len(self.sesbus.ListNames()) - 1
         except:
             self.val['session'] = -1
 #       print dir(b); print dir(s); print dir(d); print d.ListServices()


Index: dstat.spec
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/dstat.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dstat.spec	25 Apr 2008 11:26:25 -0000	1.9
+++ dstat.spec	16 Sep 2008 11:34:50 -0000	1.10
@@ -3,15 +3,14 @@
 
 Summary: Versatile resource statistics tool
 Name: dstat
-Version: 0.6.7
-Release: 3%{?dist}
+Version: 0.6.8
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://dag.wieers.com/home-made/dstat/
 
 Source: http://dag.wieers.com/home-made/dstat/dstat-%{version}.tar.bz2
-Patch0: dstat-0.6.7-int.patch
-Patch1: dstat-0.6.7-dbus.patch
+Patch0: dstat-0.6.8-dbus.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -35,8 +34,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .int
-%patch1 -p1 -b .dbus
+%patch0 -p1 -b .dbus
 
 %build
 # Make sure the docs are in unix format
@@ -61,12 +59,16 @@
 %files
 %defattr(-, root, root, 0755)
 %dir %{_datadir}/dstat
-%doc AUTHORS ChangeLog COPYING README TODO *.conf docs/*.html docs/*.txt examples/
+%doc AUTHORS ChangeLog COPYING README TODO docs/*.html docs/*.txt examples/
 %{_mandir}/man1/dstat.1*
 %{_bindir}/dstat
 %{_datadir}/dstat/*.py*
 
 %changelog
+* Tue Sep 16 2008 Zdenek Prikryl <zprikryl at redhat.com> - 0.6.8-1
+- Updated to 0.6.8
+- Fixed dbus module patch
+
 * Fri Apr 25 2008 Radek Brich <rbrich at redhat.com> - 0.6.7-3
 - fix dbus module (new dbus-python interface since FC4)
 


--- dstat-0.6.7-dbus.patch DELETED ---


--- dstat-0.6.7-int.patch DELETED ---