rpms/iftop/EL-4 iftop-0.17-bandwidth.patch, NONE, 1.1 iftop-0.17-man-typos.patch, NONE, 1.1 iftop.spec, 1.5, 1.6
Robert Scheck (robert)
fedora-extras-commits at redhat.com
Tue Aug 28 18:12:10 UTC 2007
Author: robert
Update of /cvs/pkgs/rpms/iftop/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1827
Modified Files:
iftop.spec
Added Files:
iftop-0.17-bandwidth.patch iftop-0.17-man-typos.patch
Log Message:
- Buildrequire %%{_includedir}/pcap.h instead of conditionals
- Patch to display top scale in bytes when measuring in bytes
iftop-0.17-bandwidth.patch:
--- NEW FILE iftop-0.17-bandwidth.patch ---
Backported patch from Marcin Kryczek <mkay at gentoo.org> for iftop >= 0.17,
to display top scale in bytes when measuring in bytes.
--- iftop-0.17/ui.c 2005-10-26 22:12:33.000000000 +0200
+++ iftop-0.17/ui.c.bandwidth 2006-06-22 21:36:16.000000000 +0200
@@ -263,7 +263,7 @@
char s[40], *p;
int x;
/* This 1024 vs 1000 stuff is just plain evil */
- readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, 0);
+ readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, options.bandwidth_in_bytes);
p = s + strspn(s, " ");
x = get_bar_length(i * 8);
mvaddch(*y + 1, x, ACS_BTEE);
iftop-0.17-man-typos.patch:
--- NEW FILE iftop-0.17-man-typos.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for iftop >= 0.17, which
corrects some typos within the man page.
--- iftop-0.17/iftop.8 2005-12-25 12:50:21.000000000 +0100
+++ iftop-0.17/iftop.8.man-typos 2007-08-28 19:32:25.000000000 +0200
@@ -43,7 +43,7 @@
Count web traffic only, unless it is being directed through a local web cache.
.TP
\fBicmp\fP
-How much bandwith are users wasting trying to figure out why the network is
+How much bandwidth are users wasting trying to figure out why the network is
slow?
.SH OPTIONS
@@ -229,7 +229,7 @@
Controls the appearance of each item in the display.
.TP
\fBshow-totals:\fP \fI(yes|no)\fP
-Shows cummulative total for each item.
+Shows cumulative total for each item.
.TP
\fBlog-scale:\fP \fI(yes|no)\fP
Use a logarithmic scale for bar graphs.
Index: iftop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iftop/EL-4/iftop.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- iftop.spec 10 Dec 2004 22:03:04 -0000 1.5
+++ iftop.spec 28 Aug 2007 18:11:37 -0000 1.6
@@ -1,16 +1,15 @@
-Name: iftop
-Version: 0.16
-Release: 3
-Epoch: 0
-Summary: Command line tool that displays bandwidth usage on an interface
-
-Group: Applications/Internet
-License: GPL
-URL: http://www.ex-parrot.com/~pdw/iftop
-Source0: http://www.ex-parrot.com/~pdw/iftop/download/iftop-0.16.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: libpcap, ncurses-devel
+Summary: Command line tool that displays bandwidth usage on an interface
+Name: iftop
+Version: 0.17
+Release: 6%{?dist}
+License: GPLv2+
+Group: Applications/Internet
+URL: http://www.ex-parrot.com/~pdw/%{name}/
+Source: http://www.ex-parrot.com/~pdw/%{name}/download/%{name}-%{version}.tar.gz
+Patch0: iftop-0.17-bandwidth.patch
+Patch1: iftop-0.17-man-typos.patch
+BuildRequires: ncurses-devel, %{_includedir}/pcap.h
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
iftop does for network usage what top(1) does for CPU usage. It listens to
@@ -18,33 +17,61 @@
usage by pairs of hosts. Handy for answering the question "why is our ADSL link
so slow?".
-
%prep
%setup -q
-
+%patch0 -p1 -b .bandwidth
+%patch1 -p1 -b .man-typos
%build
%configure
make %{?_smp_mflags}
-
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
+make DESTDIR=$RPM_BUILD_ROOT install
%clean
rm -rf $RPM_BUILD_ROOT
+%files
+%defattr(-,root,root)
+%doc ChangeLog COPYING README TODO
+%{_sbindir}/%{name}
+%{_mandir}/man8/%{name}.*
+
+%changelog
+* Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 0.17-6
+- Buildrequire %%{_includedir}/pcap.h instead of conditionals
+- Patch to display top scale in bytes when measuring in bytes
-%files
-%defattr(-,root,root,-)
-%doc COPYING README TODO
-%{_sbindir}/*
-%{_mandir}/man8/*
+* Sat Aug 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 0.17-5
+- fix license tag
+- rebuild for BuildID
+* Wed Nov 29 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.17-4
+- rebuild
+
+* Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.17-3
+- rebuild
+
+* Thu Jun 15 2006 Aurelien Bompard <gauret[AT]free.fr> 0.17-2
+- buildrequire libpcap-devel from FC6 on
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.17-1
+- version 0.17
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.16-7
+- rebuild for fc5
+
+* Sun Nov 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0.16-6
+- rebuild for libpcap
+
+* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 0.16-5
+- rebuild and add disttag
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
-%changelog
* Fri Jun 04 2004 Aurelien Bompard <gauret[AT]free.fr> 0:0.16-0.fdr.3
- use make install
More information about the scm-commits
mailing list