Hello community, here is the log from the commit of package iptraf for openSUSE:Factory checked in at 2013-04-02 11:54:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iptraf (Old) and /work/SRC/openSUSE:Factory/.iptraf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iptraf", Maintainer is "VDziewiecki@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/iptraf/iptraf.changes 2012-10-08 07:13:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iptraf.new/iptraf.changes 2013-04-02 11:54:31.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Mar 28 19:45:48 UTC 2013 - jengelh@inai.de + +- Update to new git snapshot 1.1.3.1+git49 +* remove TokenRing and ISDN support +* 802.1ad and QinQ VLAN handling +* restore functionality of iptraf -B (bnc#812080) +- Remove iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch + (merged upstream) +- Add 0001-build-prefer-ncurses6-and-wide.patch +- Depend on 3.1 headers (source uses ETH_P_QINQ1) + +------------------------------------------------------------------- Old: ---- iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch iptraf-ng-1.1.3.1.tar.gz New: ---- 0001-build-prefer-ncurses6-and-wide.patch iptraf-ng-1.1.3.1+git89.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iptraf.spec ++++++ --- /var/tmp/diff_new_pack.Lj6ZZ2/_old 2013-04-02 11:54:33.000000000 +0200 +++ /var/tmp/diff_new_pack.Lj6ZZ2/_new 2013-04-02 11:54:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iptraf # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,21 @@ Name: iptraf -Version: 1.1.3.1 +Version: 1.1.3.1+git89 Release: 0 Summary: TCP/IP Network Monitor License: GPL-2.0+ Group: Productivity/Networking/Diagnostic Url: https://fedorahosted.org/iptraf-ng/ -Source: https://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-%{version}.tar.gz -# from http://lists.fedoraproject.org/pipermail/scm-commits/2012-May/785091.html -# PATCH-FIX-UPSTREAM iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch andreas.stieger@gmx.de -Patch0: iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch + +#Git-Clone: git://git.fedorahosted.org/git/iptraf-ng +#DL-URL: http://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-%version.tar.gz +Source: %name-ng-%version.tar.xz +Patch1: 0001-build-prefer-ncurses6-and-wide.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: automake +BuildRequires: linux-glibc-devel >= 3.1 BuildRequires: ncurses-devel +BuildRequires: xz %description IPTraf-ng is a console-based network statistics utility. It gathers a @@ -55,17 +57,10 @@ breakdowns, and LAN station packet and byte counts. %prep -%setup -qn %name-ng-%version -# Kernel 3.5 and later removed support for TokenRing -%if 0%{?suse_version} > 1220 -%patch0 -p1 -%endif -# +%setup -qn %name-ng +%patch -P 1 -p1 %build -if [ ! -e configure ]; then - ./autogen.sh; -fi; %configure make %{?_smp_mflags}; ++++++ 0001-build-prefer-ncurses6-and-wide.patch ++++++

From ed6b73679dac063ef91c96e21aef26ca06e990b5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jengelh@inai.de> Date: Thu, 28 Mar 2013 20:56:05 +0100 Subject: [PATCH] build: prefer ncurses6 and wide

Signed-off-by: Jan Engelhardt <jengelh@inai.de> --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c8711db..46e5632 100644 --- a/Makefile +++ b/Makefile @@ -245,18 +245,18 @@ endif # try find ncuses by autodetect ifndef NCURSES_LDFLAGS - ifneq ($(shell ncurses5-config --libs 2>/dev/null),) - NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) - NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) - else ifneq ($(shell ncursesw5-config --libs 2>/dev/null),) - NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) - NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) + ifneq ($(shell ncursesw6-config --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) else ifneq ($(shell ncurses6-config --libs 2>/dev/null),) NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null) NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null) - else ifneq ($(shell ncursesw6-config --libs 2>/dev/null),) - NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) - NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) + else ifneq ($(shell ncursesw5-config --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) + else ifneq ($(shell ncurses5-config --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) endif ifneq ($(NCURSES_LDFLAGS),) -- 1.8.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org