From a28d22cc5c5a1c922f8f2e1a415fca96cc7eb2b2 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@fedoraproject.org>
Date: Sep 01 2008 09:41:44 +0000
Subject: - recreated bwbar.daemon.patch to apply cleanly


---

diff --git a/bwbar.daemon.patch b/bwbar.daemon.patch
index 0bf309e..47ad301 100644
--- a/bwbar.daemon.patch
+++ b/bwbar.daemon.patch
@@ -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 ****/
diff --git a/bwbar.spec b/bwbar.spec
index 6b27f14..d84231e 100644
--- a/bwbar.spec
+++ b/bwbar.spec
@@ -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 @@ of the current bandwidth use.  It is currently for Linux only.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 %patch1 -p0
 %patch2 -p0
 
@@ -69,6 +69,9 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Sep 01 2008 Adrian Reber <adrian@lisas.de> - 1.2.3-3
+- recreated bwbar.daemon.patch to apply cleanly
+
 * Fri Feb 15 2008 Adrian Reber <adrian@lisas.de> - 1.2.3-2
 - rebuilt for gcc43