[svn] r5184 - trunk/rpms/ntop

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-02-20 17:43:17 +0100 (Tue, 20 Feb 2007)
New Revision: 5184

Modified:
   trunk/rpms/ntop/ntop.spec
Log:
Updates

Modified: trunk/rpms/ntop/ntop.spec
===================================================================
--- trunk/rpms/ntop/ntop.spec	2007-02-20 03:10:36 UTC (rev 5183)
+++ trunk/rpms/ntop/ntop.spec	2007-02-20 16:43:17 UTC (rev 5184)
@@ -1,10 +1,13 @@
-# $Id$
+# $Id: ntop.spec 4899 2006-11-18 23:37:30Z dag $
 # Authority: dag
 # Upstream: Luca Deri <deri$ntop,org>
 
 %{?dist: %{expand: %%define %dist 1}}
 
+%{!?dist:%define _with_tcpwrappersdevel 1}
 %{!?dist:%define _with_libpcapdevel 1}
+
+%{?fc7:%define _with_tcpwrappersdevel 1}
 %{?fc6:%define _with_libpcapdevel 1}
 
 %define logmsg logger -t %{name}/rpm
@@ -12,7 +15,7 @@
 Summary: Network traffic probe that shows the network usage
 Name: ntop
 Version: 3.2
-Release: 1.2
+Release: 2
 License: GPL
 Group: Applications/System
 URL: http://www.ntop.org/
@@ -22,7 +25,9 @@
 
 BuildRequires: openssl-devel, gdbm-devel, libpcap, rrdtool-devel, zlib-devel, glib-devel
 BuildRequires: gd-devel, gcc-c++, automake, autoconf, gettext
-%{?_with_libpcapdevel:BuildRequires:libpcap-devel}
+%{?_with_libpcapdevel:BuildRequires: libpcap-devel}
+%{?_with_tcpwrappersdevel:BuildRequires: tcp_wrappers-devel}
+%{!?_without_tcpwrappers:BuildRequires: tcp_wrappers}
 Prereq: /sbin/chkconfig, /sbin/ldconfig
 
 %description
@@ -196,11 +201,11 @@
 %build
 %configure \
 	--program-prefix="%{?_program_prefix}" \
+	--enable-i18n \
+	--enable-largerrdpop \
 	--enable-optimize \
-	--enable-tcpwrap \
-	--enable-largerrdpop \
 	--enable-sslv3 \
-	--enable-i18n
+%{!?_without_tcpwrappers:--with-tcpwrap}
 #	--with-pcap-include="%{_includedir}/pcap" \
 #	--enable-xmldump \
 %{__make} %{?_smp_mflags} faq.html ntop.txt ntop.html all
@@ -275,6 +280,9 @@
 #%exclude %{_libdir}/plugins/
 
 %changelog
+* Tue Feb 20 2007 Dag Wieers <dag at wieers.com> - 3.2-2
+- Enabled tcp_wrappers functionality.
+
 * Thu Nov 03 2005 Dries Verachtert <dries at ulyssis.org> - 3.2-1
 - Updated to release 3.2.