rpms/bwbar/devel bwbar.daemon.patch,1.2,1.3 bwbar.spec,1.9,1.10

[Adrian Reber]

Author: adrian

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

Modified Files:
	bwbar.daemon.patch bwbar.spec 
Log Message:
* Mon Sep 01 2008 Adrian Reber <adrian at lisas.de> - 1.2.3-3
- recreated bwbar.daemon.patch to apply cleanly


bwbar.daemon.patch:

Index: bwbar.daemon.patch
===================================================================
RCS file: /cvs/extras/rpms/bwbar/devel/bwbar.daemon.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bwbar.daemon.patch	25 Aug 2007 13:59:53 -0000	1.2
+++ bwbar.daemon.patch	1 Sep 2008 09:41:44 -0000	1.3
@@ -1,5 +1,6 @@
---- bwbar.c.orig	2004-07-16 15:05:08.000000000 +0200
-+++ bwbar.c	2004-07-16 15:11:03.000000000 +0200
+diff -u bwbar-1.2.3/bwbar.c bwbar-1.2.3.new/bwbar.c
+--- bwbar-1.2.3/bwbar.c	2006-08-26 18:31:26.000000000 +0200
++++ bwbar-1.2.3.new/bwbar.c	2008-09-01 11:30:41.000000000 +0200
 @@ -156,6 +156,7 @@
    { "kbps",         0, 0, 'k' },
    { "Mbps",         0, 0, 'M' },
@@ -39,19 +40,15 @@
      case 'h':
        usage(0);
        break;
-@@ -278,7 +284,12 @@
- 
+@@ -279,6 +285,11 @@
    first = 1;
    lbin = 0; lbout = 0;
--
-+
+ 
 +  if ( daemon_mode == 1) {
 +    if ( fork() != 0)
 +      return 0;
 +  }
 + 
    gettimeofday(&t_last, NULL);
- 
+   
    while ( 1 ) {
- 
-     /**** Begin code that obtains bandwidth data ****/


Index: bwbar.spec
===================================================================
RCS file: /cvs/extras/rpms/bwbar/devel/bwbar.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bwbar.spec	15 Feb 2008 07:56:19 -0000	1.9
+++ bwbar.spec	1 Sep 2008 09:41:44 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Generate a readout of the current bandwidth use
 Name: bwbar
 Version: 1.2.3
-Release: 2
+Release: 3
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://www.kernel.org/pub/software/web/bwbar/bwbar-1.2.3.tar.bz2
@@ -22,7 +22,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p0
 %patch2 -p0
 
@@ -69,6 +69,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Sep 01 2008 Adrian Reber <adrian at lisas.de> - 1.2.3-3
+- recreated bwbar.daemon.patch to apply cleanly
+
 * Fri Feb 15 2008 Adrian Reber <adrian at lisas.de> - 1.2.3-2
 - rebuilt for gcc43