SPECS: ntop.spec - up to 3.3.8 - %bcond added (mysql support) - some cosmet...

[duddits]

Author: duddits                      Date: Wed Oct 15 14:46:54 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 3.3.8
- %bcond added (mysql support)
- some cosmetics in %prep
- plugins_makefile.patch obsoleted

---- Files affected:
SPECS:
   ntop.spec (1.77 -> 1.78) 

---- Diffs:

================================================================
Index: SPECS/ntop.spec
diff -u SPECS/ntop.spec:1.77 SPECS/ntop.spec:1.78
--- SPECS/ntop.spec:1.77	Sat Nov  3 11:11:05 2007
+++ SPECS/ntop.spec	Wed Oct 15 16:46:48 2008
@@ -1,19 +1,22 @@
 # $Revision$, $Date$
+# Conditional build
+#
+%bcond_with	mysql	# with mysql support
+#
 Summary:	Network monitoring tool
 Summary(pl.UTF-8):	Narzędzie do monitorowania sieci
 Name:		ntop
-Version:	3.3
-Release:	1
+Version:	3.3.8
+Release:	0.1
 License:	GPL
 Group:		Networking
 Source0:	http://dl.sourceforge.net/ntop/%{name}-%{version}.tar.gz
-# Source0-md5:	a0e52a85587c8a5519d822d04862dab4
+# Source0-md5:	19c6a582c285ffae18bf0c3b599d184e
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-Patch0:		%{name}-plugins_makefile.patch
-Patch1:		%{name}-conf.patch
-Patch3:		%{name}-config.patch
-Patch4:		%{name}-am.patch
+Patch0:		%{name}-conf.patch
+Patch1:		%{name}-config.patch
+Patch2:		%{name}-am.patch
 URL:		http://www.ntop.org/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.6
@@ -42,6 +45,7 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+%{?with_mysql:Requires:	mysql}
 Requires:	rc-scripts
 Provides:	group(ntop)
 Provides:	user(ntop)
@@ -61,25 +65,26 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch3 -p1
-%patch4 -p1
+%patch2 -p1
 
-# kill libtool.m4 copy
-cp -f acinclude.m4.ntop acinclude.m4
+# taken from autogen.sh 
+cp -f /usr/share/aclocal/libtool.m4 libtool.m4.in
+cat acinclude.m4.in libtool.m4.in acinclude.m4.ntop > acinclude.m4
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 # "verified.awk -u" calls require gawk
 %configure \
 	AWK=gawk \
 	--disable-static \
-	--enable-i18n \
 	--with-gnu-ld \
 	--with-ossl-root=%{_prefix} \
-	--with-tcpwrap
+	--with-tcpwrap \
+	%{?with_mysql:--enable-mysql}
 
 %{__make}
 
@@ -145,6 +150,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2008/10/15 14:46:48  duddits
+- up to 3.3.8
+- %bcond added (mysql support)
+- some cosmetics in %prep
+- plugins_makefile.patch obsoleted
+
 Revision 1.77  2007/11/03 10:11:05  arekm
 - up to 3.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ntop.spec?r1=1.77&r2=1.78&f=u