Hello community,
here is the log from the commit of package iftop for openSUSE:Factory checked in at 2014-01-05 10:24:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/iftop (Old)
and /work/SRC/openSUSE:Factory/.iftop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iftop"
Changes:
--------
--- /work/SRC/openSUSE:Factory/iftop/iftop.changes 2013-03-07 07:21:15.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.iftop.new/iftop.changes 2014-01-05 10:24:47.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Jan 3 10:50:42 UTC 2014 - pascal.bleser@opensuse.org
+
+- update to 1.0pre3:
+ * bugs and compilation issues were fixed
+ * a "text output" mode was added.
+
+- drop the following patches, merged upstream:
+ * iftop-manpage.patch
+ * iftop-multicast.patch
+
+-------------------------------------------------------------------
Old:
----
iftop-1.0pre2.tar.gz
iftop-manpage.patch
iftop-multicast.patch
New:
----
iftop-1.0pre3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ iftop.spec ++++++
--- /var/tmp/diff_new_pack.KOPmt6/_old 2014-01-05 10:24:47.000000000 +0100
+++ /var/tmp/diff_new_pack.KOPmt6/_new 2014-01-05 10:24:47.000000000 +0100
@@ -20,16 +20,15 @@
Summary: Real-Time Interface Bandwidth Usage
License: GPL-2.0+
Group: Productivity/Networking/Diagnostic
-Version: 0.99.2
+Version: 0.99.3
Release: 0
-%define real_version 1.0pre2
+%define pkg_version 1.0pre3
Url: http://www.ex-parrot.com/~pdw/iftop/
BuildRequires: libpcap-devel
BuildRequires: ncurses-devel
BuildRequires: automake
-Source0: %name-%real_version.tar.gz
-Patch1: %name-manpage.patch
-Patch2: %name-multicast.patch
+Source0: http://www.ex-parrot.com/~pdw/iftop/download/iftop-%{pkg_version}.tar.gz
+# Patch1: %name-manpage.patch
Patch3: iftop-implicit-pointer-decl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -39,36 +38,28 @@
bandwidth usage by pairs of hosts. It is handy for explaining why the
network links slow.
-
-
-Authors:
---------
- Paul Warren
- Chris Lightfoot
-
%prep
-%setup -q -n %name-%real_version
-%patch1 -p0
-%patch2 -p1
-%patch3
+%setup -q -n %name-%pkg_version
+#patch1 -p0
+%patch3 -p1
%build
autoreconf -fiv
export CFLAGS="%optflags $(ncursesw6-config --cflags)"
export LDFLAGS="$(ncursesw6-config --libs)"
%configure
-%__make %{?jobs:-j%jobs} CPPFLAGS=-DUSE_GETIFADDRS
+%__make %{?smp_mflags} CPPFLAGS=-DUSE_GETIFADDRS
%install
%makeinstall
%clean
-rm -rf $RPM_BUILD_ROOT
+%{?buildroot:%__rm -rf '%{buildroot}'}
%files
%defattr(-,root,root)
%doc README ChangeLog COPYING TODO
%{_sbindir}/iftop
-%{_mandir}/man8/*
+%doc %{_mandir}/man8/iftop.8*
%changelog
++++++ iftop-1.0pre2.tar.gz -> iftop-1.0pre3.tar.gz ++++++
++++ 17803 lines of diff (skipped)
++++++ iftop-implicit-pointer-decl.patch ++++++
--- /var/tmp/diff_new_pack.KOPmt6/_old 2014-01-05 10:24:47.000000000 +0100
+++ /var/tmp/diff_new_pack.KOPmt6/_new 2014-01-05 10:24:47.000000000 +0100
@@ -1,45 +1,19 @@
---- cfgfile.h.orig
-+++ cfgfile.h
-@@ -13,14 +13,14 @@ typedef struct {
- int value;
- } config_enumeration_type;
-
--int read_config();
-+int read_config(char *file, int whinge_on_error);
-
- char *config_get_string(const char *directive);
- int config_get_bool(const char *directive);
- int config_get_int(const char *directive, int *value);
- int config_get_float(const char *directive, float *value);
- int config_init();
--
--
-+void config_set_string(const char *directive, const char* s);
-+int config_get_enum(const char *directive, config_enumeration_type *enumeration, int *value);
-
- #endif /* __CFGFILE_H_ */
---- iftop.c.orig
-+++ iftop.c
-@@ -3,6 +3,8 @@
- *
- */
-
-+#define NCURSES_NOMACROS 1
-+#define NCURSES_OPAQUE 1
- #include "integers.h"
-
- #include
-@@ -62,6 +64,8 @@ struct in6_addr if_ip6_addr;
+diff --git a/Makefile.am b/Makefile.am
+index 5009efd..2206245 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,6 +10,7 @@
+ # $Id: Makefile.am,v 1.12 2014/01/01 14:37:31 pdw Exp $
+ #
- extern options_t options;
++AM_CPPFLAGS = -include $(top_builddir)/config.h
+ sbin_PROGRAMS = iftop
+ #iftop-dump
-+extern int get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr, struct in6_addr *if_ip6_addr);
-+
- hash_type* history;
- history_type history_totals;
- time_t last_timestamp;
---- cfgfile.c.orig
-+++ cfgfile.c
+diff --git a/cfgfile.c b/cfgfile.c
+index ad1edc8..89f7c6f 100644
+--- a/cfgfile.c
++++ b/cfgfile.c
@@ -8,6 +8,7 @@
#include
#include
@@ -48,19 +22,11 @@
#include "stringmap.h"
#include "iftop.h"
---- options.h.orig
-+++ options.h
-@@ -93,5 +93,6 @@ typedef struct {
-
- void options_set_defaults();
- void options_read(int argc, char **argv);
--
-+void options_read_args(int argc, char **argv);
-+void options_make(void);
- #endif /* __OPTIONS_H_ */
---- configure.in.orig
-+++ configure.in
-@@ -34,7 +34,9 @@ AM_INIT_AUTOMAKE(iftop, "1.0pre2")
+diff --git a/configure.in b/configure.in
+index 6c369a8..32db3d9 100644
+--- a/configure.in
++++ b/configure.in
+@@ -34,7 +34,9 @@ AM_INIT_AUTOMAKE(iftop, "1.0pre3")
AC_DEFINE_UNQUOTED(IFTOP_VERSION, "$VERSION", [The iftop version number])
dnl Make sure we have a C compiler....
@@ -71,30 +37,35 @@
AC_HEADER_STDC
dnl
---- Makefile.am.orig
-+++ Makefile.am
-@@ -10,6 +10,7 @@
- # $Id: Makefile.am,v 1.11 2010/11/27 17:19:25 pdw Exp $
- #
-
-+AM_CPPFLAGS = -include $(top_builddir)/config.h
- sbin_PROGRAMS = iftop
- #iftop-dump
-
---- edline.c.orig
-+++ edline.c
-@@ -6,6 +6,9 @@
-
+diff --git a/edline.c b/edline.c
+index 75f1a5a..d0d3093 100644
+--- a/edline.c
++++ b/edline.c
+@@ -7,6 +7,8 @@
static const char rcsid[] = "$Id: edline.c,v 1.2 2002/11/04 12:27:35 chris Exp $";
+ #include
+#define NCURSES_NOMACROS 1
+#define NCURSES_OPAQUE 1
-+
- #include
#include
#include
---- ui.c.orig
-+++ ui.c
+
+diff --git a/options.h b/options.h
+index 86620d9..9b841e6 100644
+--- a/options.h
++++ b/options.h
+@@ -96,5 +96,7 @@ typedef struct {
+
+ void options_set_defaults();
+ void options_read(int argc, char **argv);
++void options_read_args(int argc, char **argv);
++void options_make(void);
+
+ #endif /* __OPTIONS_H_ */
+diff --git a/ui.c b/ui.c
+index b85d63e..27a599d 100644
+--- a/ui.c
++++ b/ui.c
@@ -3,6 +3,9 @@
*
*/
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org