[iftop] Update to 1.0pre4 (#1047679, #1055277)

[Robert Scheck]

commit 1a6493a407b0f205ce05364adfe5eae6c9861206
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jan 20 00:24:57 2014 +0100

    Update to 1.0pre4 (#1047679, #1055277)

 .gitignore                     |    2 +-
 iftop-1.0-memory-leak.patch    |   30 ------------------------------
 iftop-1.0-ncursesw.patch       |   25 +++++++++++++++++++++++++
 iftop-1.0-nss-myhostname.patch |   32 --------------------------------
 iftop.spec                     |   18 +++++++++---------
 sources                        |    2 +-
 6 files changed, 36 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eb4d2cb..390f35d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-iftop-1.0pre2.tar.gz
+/iftop-*.tar.gz
diff --git a/iftop-1.0-ncursesw.patch b/iftop-1.0-ncursesw.patch
new file mode 100644
index 0000000..e0d4ce2
--- /dev/null
+++ b/iftop-1.0-ncursesw.patch
@@ -0,0 +1,25 @@
+Patch by Robert Scheck <robert at fedoraproject.org> for iftop <= 1.0pre4 to avoid a
+regression that would reopen https://bugzilla.redhat.com/show_bug.cgi?id=546032.
+
+--- iftop-1.0pre4/configure.ac			2014-01-19 21:28:31.000000000 +0100
++++ iftop-1.0pre4/configure.ac.ncursesw		2014-01-20 00:12:54.000000000 +0100
+@@ -353,7 +353,7 @@
+ for curseslib in ncursesw curses ncurses ; do
+     LIBS="$oldLIBS -l$curseslib"
+     AC_TRY_LINK([
+-#include <$curseslib.h>
++#include <curses.h>
+         ], [
+         mvchgat(0, 0, 1, A_REVERSE, 0, NULL)
+         ], [
+--- iftop-1.0pre4/configure			2014-01-19 21:32:58.000000000 +0100
++++ iftop-1.0pre4/configure.ncursesw		2014-01-20 00:13:15.000000000 +0100
+@@ -5745,7 +5745,7 @@
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-#include <$curseslib.h>
++#include <curses.h>
+ 
+ int
+ main ()
diff --git a/iftop.spec b/iftop.spec
index 5d424a3..f041aa7 100644
--- a/iftop.spec
+++ b/iftop.spec
@@ -1,15 +1,13 @@
 Summary:	Command line tool that displays bandwidth usage on an interface
 Name:		iftop
 Version:	1.0
-Release:	0.6.pre2%{?dist}
+Release:	0.7.pre4%{?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}pre2.tar.gz
-Patch0:		iftop-1.0-memory-leak.patch
-Patch1:		iftop-1.0-nss-myhostname.patch
+Source:		http://www.ex-parrot.com/~pdw/%{name}/download/%{name}-%{version}pre4.tar.gz
+Patch0:		iftop-1.0-ncursesw.patch
 BuildRequires:	ncurses-devel, %{_includedir}/pcap.h
-BuildRequires:	autoconf
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -19,10 +17,9 @@ usage by pairs of hosts. Handy for answering the question "why is our ADSL link
 so slow?".
 
 %prep
-%setup -q -n %{name}-%{version}pre2
-%patch0 -p1 -b .memory-leak
-%patch1 -p1 -b .nss-myhostname
-autoconf
+%setup -q -n %{name}-%{version}pre4
+%patch0 -p1 -b .ncursesw
+touch -c -r configure.ac{.ncursesw,}
 
 %build
 %configure
@@ -42,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Mon Jan 20 2014 Robert Scheck <robert at fedoraproject.org> 1.0-0.7.pre4
+- Update to 1.0pre4 (#1047679, #1055277)
+
 * Thu Dec 19 2013 Robert Scheck <robert at fedoraproject.org> 1.0-0.6.pre2
 - Added patch to fix a memory leak in resolver.c (#782275, #861582)
 - Run autoreconf to recognize aarch64 (#925579)
diff --git a/sources b/sources
index 551dfb5..d5b5d10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fef521a49ec0122458d02c64212af3c5  iftop-1.0pre2.tar.gz
+7e6decb4958e8a4890cccac335239f24  iftop-1.0pre4.tar.gz