From 483fb8510f4bfbc30a5e7324c5ed091d5edc4216 Mon Sep 17 00:00:00 2001
From: Christopher Meng <rpm@cicku.me>
Date: Sep 16 2013 08:22:42 +0000
Subject: Merge branch 'master' into f19


Conflicts:
	bwm-ng.spec

---

diff --git a/bwm-ng.spec b/bwm-ng.spec
index 541acf5..fad2642 100644
--- a/bwm-ng.spec
+++ b/bwm-ng.spec
@@ -1,49 +1,51 @@
-Summary:		Bandwidth Monitor NG
-Name:			bwm-ng
-
-Version:		0.6
-Release:		10.1%{?dist}
-
-License:		GPLv2+
-Group:			Applications/System
-URL:			http://www.volker-gropp.de/?id=projects&sub=bwm-ng
-
-Source0:		http://www.volker-gropp.de/bwm-ng/bwm-ng-%{version}.tar.gz
-Source1:		bwm-ng.conf
-
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:		hostname, procps
-BuildRequires:	ncurses-devel, libstatgrab-devel
+Name:           bwm-ng
+Version:        0.6
+Release:        12%{?dist}
+Summary:        Bandwidth Monitor NG
+License:        GPLv2+
+URL:            http://www.volker-gropp.de/?id=projects&sub=bwm-ng
+Source0:        http://www.volker-gropp.de/bwm-ng/%{name}-%{version}.tar.gz
+Source1:        bwm-ng.conf
+Requires:       hostname
+Requires:       procps
+BuildRequires:  libstatgrab-devel
+BuildRequires:  ncurses-devel
 
 %description
-A small and simple curses base bandwidth monitor. No big features.
+A small and simple console-based live network and disk io bandwidth monitor.
+
+Features:
+- Supports /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats 
+/proc/partitions, IOKit, devstat and libstatgrab
+- Unlimited number of interfaces/devices supported
+- Interfaces/devices are added or removed dynamically from list
+- White-/blacklist of interfaces/devices
+- Output of KB/s, Kb/s, packets, errors, average, max and total sum
+- Output in curses, plain console, CSV or HTML
+- Configfile
 
 %prep
 %setup -q
 
 %build
-%configure	--enable-64bit \
-			--enable-netstatbyte \
-			--enable-netstatlink \
-			--with-ncurses \
-			--with-time	\
-			--with-getopt_long \
-			--with-getifaddrs \
-			--with-sysctl \
-			--with-procnetdev \
-			--with-libstatgrab \
-			--with-netstatlinux	\
-			--without-strip
-%{__make} %{?_smp_mflags}
+%configure --enable-64bit \
+	--enable-netstatbyte \
+	--enable-netstatlink \
+	--with-ncurses \
+	--with-time \
+	--with-getopt_long \
+	--with-getifaddrs \
+	--with-sysctl \
+	--with-procnetdev \
+	--with-libstatgrab \
+	--with-netstatlinux \
+	--without-strip
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -D -m755 src/bwm-ng $RPM_BUILD_ROOT%{_bindir}/bwm-ng
-install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bwm-ng.conf
-install -D -m644 bwm-ng.1 $RPM_BUILD_ROOT%{_mandir}/man1/bwm-ng.1
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -pDm755 src/bwm-ng %{buildroot}%{_bindir}/bwm-ng
+install -pDm644 %{S:1} %{buil1008278droot}%{_sysconfdir}/bwm-ng.conf
+install -pDm644 bwm-ng.1 %{buildroot}%{_mandir}/man1/bwm-ng.1
 
 %files
 %doc AUTHORS README ChangeLog bwm-ng.conf-example bwm-ng.css
@@ -52,8 +54,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/bwm-ng.1*
 
 %changelog
-* Tue Aug 13 2013 Oliver Falk <oliver@linux-kernel.at> - 0.6-10.1
-- Rebuild against new libstatgrab
+* Mon Sep 16 2013 Christopher Meng <rpm@cicku.me> - 0.6-12
+- Rebuild for libstatgrab(BZ#1008278).
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild