SPECS: ntop.spec - merged few changes from dead DEVEL 1.51.2.2 branch

[glen]

Author: glen                         Date: Mon Jan  2 14:14:52 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged few changes from dead DEVEL 1.51.2.2 branch

---- Files affected:
SPECS:
   ntop.spec (1.69 -> 1.70) 

---- Diffs:

================================================================
Index: SPECS/ntop.spec
diff -u SPECS/ntop.spec:1.69 SPECS/ntop.spec:1.70
--- SPECS/ntop.spec:1.69	Mon Jan  2 14:47:03 2006
+++ SPECS/ntop.spec	Mon Jan  2 15:14:47 2006
@@ -5,7 +5,7 @@
 Summary(pl):	Narzędzie do monitorowania sieci
 Name:		ntop
 Version:	3.2
-Release:	0.7
+Release:	0.8
 License:	GPL
 Group:		Networking
 Source0:	http://dl.sourceforge.net/ntop/%{name}-%{version}.tgz
@@ -19,7 +19,7 @@
 Patch4:		%{name}-am.patch
 URL:		http://www.ntop.org/
 BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	automake >= 1.6
 BuildRequires:	gawk
 BuildRequires:	gd-devel >= 2.0.1
 BuildRequires:	gdbm-devel >= 1.8.3
@@ -34,6 +34,7 @@
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rrdtool-devel >= 1.1.0
 BuildRequires:	zlib-devel
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
@@ -87,7 +88,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_localstatedir},/etc/{rc.d/init.d,sysconfig},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_localstatedir}/rrd,/etc/{rc.d/init.d,sysconfig},%{_sbindir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -132,8 +133,9 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README THANKS
+%doc AUTHORS ChangeLog NEWS README THANKS docs/{1STRUN.txt,FAQ}
 %attr(770,root,ntop) %dir %{_localstatedir}
+%attr(770,root,ntop) %dir %{_localstatedir}/rrd
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_datadir}/%{name}
@@ -144,7 +146,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ntop
 %attr(750,root,ntop) %dir %{_sysconfdir}/ntop
 %attr(640,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop/*
-%attr(644,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop.conf
+%attr(660,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop.conf
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -152,6 +154,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2006/01/02 14:14:47  glen
+- merged few changes from dead DEVEL 1.51.2.2 branch
+
 Revision 1.69  2006/01/02 13:47:03  glen
 - enable xmldump deps. fixed am
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ntop.spec?r1=1.69&r2=1.70&f=u