diff --git a/.gitignore b/.gitignore
index e69de29..eb1e08b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/bwm-ng-0.6.1.tar.gz
diff --git a/bwm-ng-0.6-format-security.patch b/bwm-ng-0.6-format-security.patch
deleted file mode 100644
index 89a67bb..0000000
--- a/bwm-ng-0.6-format-security.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/output.c
-+++ a/src/output.c
-@@ -223,8 +223,8 @@ int print_header(int option) {
- fprintf(tmp_out_file,"bwm-ng stats\n\n\n");
- }
- fprintf(tmp_out_file,"");
- fprintf(tmp_out_file,"| Interface | Rx | Tx | Total |
");
- break;
-@@ -234,7 +234,7 @@ int print_header(int option) {
- if (output_method==PLAIN_OUT && ansi_output) printf("\033[1;2H");
- printf("bwm-ng v" VERSION " (delay %2.3fs); ",(float)delay/1000);
- if (output_method==PLAIN_OUT) printf("press 'ctrl-c' to end this%s",(ansi_output ? "\033[2;2H" : "")); else printf("input: ");
-- printf(input2str());
-+ printf("%s", input2str());
- printf("%s\n",show_all_if2str());
- if (output_method==PLAIN_OUT) {
- if (ansi_output)
diff --git a/bwm-ng.spec b/bwm-ng.spec
index caa6c4f..571db61 100644
--- a/bwm-ng.spec
+++ b/bwm-ng.spec
@@ -1,13 +1,11 @@
Name: bwm-ng
-Version: 0.6
-Release: 20%{?dist}
+Version: 0.6.1
+Release: 1%{?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
-Patch0: bwm-ng-0.6-format-security.patch
-BuildRequires: libstatgrab-devel
BuildRequires: ncurses-devel
Requires: hostname
Requires: procps
@@ -27,13 +25,8 @@ Features:
%prep
%setup -q
-%patch0 -p1
%build
-# FIXME: Package suffers from c11/inline issues
-# Workaround by appending --std=gnu89 to CFLAGS
-# Proper fix would be to fix the source-code
-CFLAGS="${RPM_OPT_FLAGS} -std=gnu89"
%configure --enable-64bit \
--enable-netstatbyte \
--enable-netstatlink \
@@ -43,7 +36,6 @@ CFLAGS="${RPM_OPT_FLAGS} -std=gnu89"
--with-getifaddrs \
--with-sysctl \
--with-procnetdev \
- --with-libstatgrab \
--with-netstatlinux \
--without-strip
make %{?_smp_mflags}
@@ -60,6 +52,11 @@ install -pDm644 bwm-ng.1 %{buildroot}%{_mandir}/man1/bwm-ng.1
%{_mandir}/man1/bwm-ng.1*
%changelog
+* Tue Feb 16 2016 Sven Lankes - 0.6.1-1
+- new upstream release
+- remove upstreamed patch
+- remove dependency on libstatgrab (no longer default upstream)
+
* Wed Feb 03 2016 Fedora Release Engineering - 0.6-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index a312980..92a3432 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3a02484fb7946371bfb4e10927cebfb bwm-ng-0.6.tar.gz
+ef0c7669508e95f56250ad4f8db98b7f bwm-ng-0.6.1.tar.gz