rpms/dstat/devel .cvsignore, 1.8, 1.9 dstat-0.6.8-dbus.patch, 1.2, 1.3 dstat.spec, 1.16, 1.17 sources, 1.8, 1.9 dstat-0.6.9-counts.patch, 1.1, NONE

[Jan Zeleny]

Author: jzeleny

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

Modified Files:
	.cvsignore dstat-0.6.8-dbus.patch dstat.spec sources 
Removed Files:
	dstat-0.6.9-counts.patch 
Log Message:
rebased to 0.7.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	4 Dec 2008 16:15:24 -0000	1.8
+++ .cvsignore	3 Dec 2009 15:49:09 -0000	1.9
@@ -1 +1 @@
-dstat-0.6.9.tar.bz2
+dstat-0.7.0.tar.bz2

dstat-0.6.8-dbus.patch:
 dstat_dbus.py |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Index: dstat-0.6.8-dbus.patch
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/dstat-0.6.8-dbus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dstat-0.6.8-dbus.patch	4 Dec 2008 16:15:24 -0000	1.2
+++ dstat-0.6.8-dbus.patch	3 Dec 2009 15:49:09 -0000	1.3
@@ -1,7 +1,7 @@
 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):
+@@ -18,21 +18,23 @@ class dstat_dbus(dstat):
          try:
              global dbus
              import dbus
@@ -13,7 +13,6 @@ diff -up dstat-0.6.8/plugins/dstat_dbus.
 -                    self.sesbus = None
 -            except:
 -                raise Exception, 'Unable to connect to dbus message bus'
--            return True
          except:
              raise Exception, 'Needs python-dbus module'
 +        try:


Index: dstat.spec
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/dstat.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- dstat.spec	24 Jul 2009 20:36:12 -0000	1.16
+++ dstat.spec	3 Dec 2009 15:49:09 -0000	1.17
@@ -3,15 +3,14 @@
 
 Summary: Versatile resource statistics tool
 Name: dstat
-Version: 0.6.9
-Release: 5%{?dist}
+Version: 0.7.0
+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.8-dbus.patch
-Patch1: dstat-0.6.9-counts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -36,7 +35,6 @@ confusion, less mistakes.
 %prep
 %setup -q
 %patch0 -p1 -b .dbus
-%patch1 -p1 -b .counts
 
 %build
 # Make sure the docs are in unix format
@@ -67,6 +65,9 @@ cd docs
 %{_datadir}/dstat/*.py*
 
 %changelog
+* Thu Dec 03 2009 Jan Zeleny <jzeleny at redhat.com> - 0.7.0-1
+- rebased to 0.7.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dstat/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	4 Dec 2008 16:15:24 -0000	1.8
+++ sources	3 Dec 2009 15:49:09 -0000	1.9
@@ -1 +1 @@
-f0a3cb77d647462f161c44c7071230ec  dstat-0.6.9.tar.bz2
+824c0675b514e4d5f3bbb88d0f654b3a  dstat-0.7.0.tar.bz2


--- dstat-0.6.9-counts.patch DELETED ---