packages: ntop/ntop.spec - shitty build system (prog is shit as well, consu...

[glen]

Author: glen                         Date: Tue Apr  6 20:58:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- shitty build system (prog is shit as well, consuming all ram when run): two todos

---- Files affected:
packages/ntop:
   ntop.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: packages/ntop/ntop.spec
diff -u packages/ntop/ntop.spec:1.83 packages/ntop/ntop.spec:1.84
--- packages/ntop/ntop.spec:1.83	Sat Apr  3 19:23:16 2010
+++ packages/ntop/ntop.spec	Tue Apr  6 22:58:17 2010
@@ -1,8 +1,11 @@
 # $Revision$, $Date$
+# TODO
+# - see geoip patch from fc
+# - use system lua
 #
 # Conditional build:
 %bcond_with	mysql	# with mysql support
-#
+
 Summary:	Network monitoring tool
 Summary(pl.UTF-8):	Narzędzie do monitorowania sieci
 Name:		ntop
@@ -10,7 +13,7 @@
 Release:	2
 License:	GPL
 Group:		Networking
-Source0:	http://dl.sourceforge.net/ntop/%{name}-%{version}.tar.gz
+Source0:	http://downloads.sourceforge.net/ntop/%{name}-%{version}.tar.gz
 # Source0-md5:	6e2ffa90d5f935c8f03d88a5dd19a866
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
@@ -18,6 +21,7 @@
 Patch1:		%{name}-config.patch
 Patch2:		%{name}-am.patch
 URL:		http://www.ntop.org/
+BuildRequires:	GeoIP-devel
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.6
 BuildRequires:	gawk
@@ -31,10 +35,10 @@
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool
 BuildRequires:	libwrap-devel
+BuildRequires:	lua-devel
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	readline-devel >= 4.2
-BuildRequires:	rpmbuild(macros) >= 1.202
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	rrdtool-devel >= 1.1.0
 BuildRequires:	zlib-devel
@@ -67,8 +71,8 @@
 %patch1 -p1
 %patch2 -p1
 
-# taken from autogen.sh 
-cp -f /usr/share/aclocal/libtool.m4 libtool.m4.in
+# taken from autogen.sh
+cp -f %{_aclocaldir}/libtool.m4 libtool.m4.in
 cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
 
 %build
@@ -150,6 +154,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2010/04/06 20:58:17  glen
+- shitty build system (prog is shit as well, consuming all ram when run): two todos
+
 Revision 1.83  2010/04/03 17:23:16  glen
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntop/ntop.spec?r1=1.83&r2=1.84&f=u