[ntop] Fix python support. Build with PAM. Drop no longer available configure options.

[Sven Lankes]

commit d3bfb1157e86539ecac1a5982ca36d7c6242ceb3
Author: Sven Lankes <sven at lank.es>
Date:   Mon Nov 28 21:25:38 2011 +0100

    Fix python support.
    Build with PAM.
    Drop no longer available configure options.

 ntop-4.1.0-python.patch |   12 ++++++++++++
 ntop.spec               |   17 ++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/ntop-4.1.0-python.patch b/ntop-4.1.0-python.patch
new file mode 100644
index 0000000..367e991
--- /dev/null
+++ b/ntop-4.1.0-python.patch
@@ -0,0 +1,12 @@
+diff -up ntop-4.1.0/configure.in~ ntop-4.1.0/configure.in
+--- ntop-4.1.0/configure.in~	2011-11-28 01:37:11.005009619 +0200
++++ ntop-4.1.0/configure.in	2011-11-28 01:48:44.213199149 +0200
+@@ -1480,7 +1480,7 @@ dnl>
+ 
+     dnl remove unecessary path
+     dnl line below workaround for OSX 10.6 (Snow Leopard)/10.7 (Lion)
+-    PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386// | sed -e "s/-arch ppc// | sed -e "s/-arch x86_64//"`
++    PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
+     INCS="${INCS} ${PYTHON_INCS}"
+ 
+ OLD_CFLAGS=$CFLAGS
diff --git a/ntop.spec b/ntop.spec
index c26ac06..d680d72 100644
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,6 +1,6 @@
 Name:           ntop
 Version:        4.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A network traffic probe similar to the UNIX top command
 Group:          Applications/Internet
 # Confirmed from fedora legal 488717
@@ -13,6 +13,7 @@ Source3:        http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.d
 Source4:        http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
 # Source: wget -O etter.finger.os.gz http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share?rev=HEAD
 Source5:        etter.finger.os.gz
+Patch0:         ntop-4.1.0-python.patch
 Patch1:         ntop-am.patch
 Patch2:         ntop-running-user.patch
 Patch3:         ntop-dbfile-default-dir.patch
@@ -22,7 +23,7 @@ Patch6:         ntop-dot-default-path.patch
 BuildRequires:  autoconf, automake, pkgconfig, libtool, groff, libpcap-devel wget
 BuildRequires:  gdbm-devel, gd-devel, rrdtool-devel, openssl-devel
 BuildRequires:  net-snmp-devel, lm_sensors-devel, pcre-devel, mysql-devel
-BuildRequires:  tcp_wrappers-devel, perl(ExtUtils::Embed)
+BuildRequires:  tcp_wrappers-devel, perl(ExtUtils::Embed), pam-devel
 BuildRequires:  GeoIP-devel, libevent-devel, lua-devel, python-devel
 BuildRequires:	systemd-units
 Requires:       initscripts, graphviz
@@ -66,6 +67,7 @@ find . \( -name \*\.gz -o -name \*\.c -o -name \*\.h -o -name \*\.pdf \
      -o -name \*\.dtd -o -name \*\.html -o -name \*\.js \) -print     \
      | xargs chmod a-x
 
+%patch0 -p1 -b .python
 %patch1 -p1 -b .am
 %patch2 -p1 -b .user
 %patch3 -p1 -b .dbfile-default-dir
@@ -77,11 +79,7 @@ find . \( -name \*\.gz -o -name \*\.c -o -name \*\.h -o -name \*\.pdf \
 #run ntop own autoconf wrapper
 ./autogen.sh --noconfig
 
-%{configure} --with-tcpwrap                            \
-             --enable-sslv3                            \
-             --enable-i18n                             \
-             --enable-snmp                             \
-             --enable-mysql                            \
+%{configure} --enable-snmp                             \
              --disable-static
 #rpath problem
 sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -202,6 +200,11 @@ fi
 %{_localstatedir}/lib/ntop/rrd
 
 %changelog
+* Mon Nov 28 2011 Ville Skyttä <ville.skytta at iki.fi> - 4.1.0-2
+- Fix python support.
+- Build with PAM.
+- Drop no longer available configure options.
+
 * Thu Nov 23 2011 Sven Lankes <sven at lank.es> - 4.1.0-1
 - update to latest upstream release (rhbz #652868)
 - rebuild to not include debug info (rhbz #713613)