[iptraf-ng/el5] fix build

Nikola Pajkovsky npajkovs at fedoraproject.org
Fri May 4 10:54:19 UTC 2012


commit 50753e9154ae998a59e7063c5df1c01fe9b10fc5
Author: Nikola Pajkovsky <npajkovs at redhat.com>
Date:   Fri May 4 12:50:28 2012 +0200

    fix build
    
    Signed-off-by: Nikola Pajkovsky <npajkovs at redhat.com>

 ...f-no-ncurses-5-6-config-use-some-default-.patch |   54 ++++++++++++++++++++
 iptraf-ng.spec                                     |    4 ++
 2 files changed, 58 insertions(+), 0 deletions(-)
---
diff --git a/0001-configure-if-no-ncurses-5-6-config-use-some-default-.patch b/0001-configure-if-no-ncurses-5-6-config-use-some-default-.patch
new file mode 100644
index 0000000..e261b88
--- /dev/null
+++ b/0001-configure-if-no-ncurses-5-6-config-use-some-default-.patch
@@ -0,0 +1,54 @@
+From 7a0190df07804c82d482629872fd338b5bb0cbe2 Mon Sep 17 00:00:00 2001
+Message-Id: <7a0190df07804c82d482629872fd338b5bb0cbe2.1336128224.git.npajkovs at redhat.com>
+From: Nikola Pajkovsky <npajkovs at redhat.com>
+Date: Fri, 4 May 2012 11:32:56 +0200
+Subject: [PATCH] configure: if no ncurses[5,6]-config, use some default libs
+
+Signed-off-by: Nikola Pajkovsky <npajkovs at redhat.com>
+---
+ configure.ac |   15 ++-------------
+ 1 file changed, 2 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 399c0e7..1c03a20 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,8 +8,7 @@ dnl checks for system type
+ AC_CANONICAL_HOST
+ AC_DEFINE_UNQUOTED([PLATFORM], "${host}", [Define to platform])
+ 
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign silent-rules])
+-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
++AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+ 
+ AC_PROG_CC
+ AC_LANG_C
+@@ -27,7 +26,7 @@ elif test "x$ncurses5_config" = "xyes"; then
+     libncurses_CFLAGS=$("ncurses5-config" --cflags)
+     libncurses_LIBS=$("ncurses5-config" --libs)
+ else
+-    AC_MSG_ERROR([Install ncurses5-dev or ncurses6-dev])
++    libncurses_LIBS="-lncurses"
+ fi
+ 
+ libpanel_LIBS="-lpanel"
+@@ -48,16 +47,6 @@ AC_CHECK_HEADERS([sys/socket.h])
+ AC_CHECK_HEADERS([sys/time.h])
+ AC_CHECK_HEADERS([locale.h])
+ 
+-dnl checks for types
+-AC_TYPE_PID_T
+-AC_TYPE_SIZE_T
+-AC_TYPE_UINT32_T
+-AC_TYPE_UINT8_T
+-
+-dnl checks for library functions
+-AC_FUNC_FORK
+-AC_FUNC_MALLOC
+-
+ regular_CFLAGS="-W -Wall -std=gnu99 -pedantic"
+ AC_SUBST([regular_CFLAGS])
+ 
+-- 
+1.7.10
+
diff --git a/iptraf-ng.spec b/iptraf-ng.spec
index 4ad642b..048214c 100644
--- a/iptraf-ng.spec
+++ b/iptraf-ng.spec
@@ -9,6 +9,8 @@ License:        GPLv2+
 Group:          Applications/System
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel
+BuildRequires:  autoconf automake
+Patch0:		0001-configure-if-no-ncurses-5-6-config-use-some-default-.patch
 
 %description
 IPTraf-ng is a console-based network monitoring utility.  IPTraf gathers
@@ -30,8 +32,10 @@ on a wide variety of supported network cards.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+autoreconf --force --install
 %configure
 make %{?_smp_mflags}
 


More information about the scm-commits mailing list