Author: glen Date: Tue Apr 6 22:08:15 2010 GMT Module: packages Tag: HEAD ---- Log message: - symlink duplicate files, verbose files, enable snmp
---- Files affected: packages/ntop: ntop.spec (1.86 -> 1.87) ---- Diffs: ================================================================ Index: packages/ntop/ntop.spec diff -u packages/ntop/ntop.spec:1.86 packages/ntop/ntop.spec:1.87 --- packages/ntop/ntop.spec:1.86 Tue Apr 6 23:54:45 2010 +++ packages/ntop/ntop.spec Wed Apr 7 00:08:10 2010 @@ -1,8 +1,8 @@ # $Revision$, $Date$ # TODO # - see if it uses system files for ettercap and geoip files we did not package -# - see if /etc/ntop/oui.txt.gz can be externalized (ethernet vendor id file), -# hwdata uses same file for example. url: http://linux.die.net/man/1/get-oui +# - see if /etc/ntop/oui.txt.gz can be externalized (whatever it is) +# - see where plugins are needed in plugin dir or in system dir # # Conditional build: %bcond_with mysql # with mysql support @@ -42,6 +42,7 @@ BuildRequires: libwrap-devel BuildRequires: lua51-devel BuildRequires: ncurses-devel >= 5.2 +BuildRequires: net-snmp-devel BuildRequires: openssl-devel >= 0.9.7d BuildRequires: readline-devel >= 4.2 BuildRequires: rpmbuild(macros) >= 1.268 @@ -101,6 +102,7 @@ --with-gnu-ld \ --with-ossl-root=%{_prefix} \ --with-tcpwrap \ + --enable-snmp \ %{?with_mysql:--enable-mysql} %{__make} @@ -118,6 +120,11 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ntop cp -a packages/RedHat/ntop.conf.sample $RPM_BUILD_ROOT%{_sysconfdir}/ntop.conf +# these are identical files according to find-debuginfo +for p in icmpPlugin lastSeenPlugin netflowPlugin cpacketPlugin rrdPlugin sflowPlugin; do + ln -snf ../../lib$p-%{version}.so $RPM_BUILD_ROOT%{_libdir}/ntop/plugins/$p.so +done + # no -devel rm -f $RPM_BUILD_ROOT%{_libdir}{,/ntop/plugins}/*.la @@ -149,19 +156,22 @@ %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README THANKS docs/{1STRUN.txt,FAQ} -%attr(770,root,ntop) %dir %{_localstatedir}/ntop -%attr(770,root,ntop) %dir %{_localstatedir}/ntop/rrd -%attr(755,root,root) %{_sbindir}/* +%attr(750,root,ntop) %dir %{_sysconfdir}/ntop +%attr(640,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop/ntop-cert.pem +%attr(640,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop/oui.txt.gz +%attr(640,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop/specialMAC.txt.gz +%attr(660,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop.conf +%attr(754,root,root) /etc/rc.d/init.d/ntop +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ntop +%attr(755,root,root) %{_sbindir}/ntop %attr(755,root,root) %{_libdir}/lib*.so %attr(755,root,root) %{_datadir}/%{name} %dir %{_libdir}/%{name} %attr(755,root,root) %{_libdir}/%{name}/plugins -%{_mandir}/man*/* -%attr(754,root,root) /etc/rc.d/init.d/ntop -%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(660,root,ntop) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntop.conf +%{_mandir}/man8/ntop.8* + +%attr(770,root,ntop) %dir %{_localstatedir}/ntop +%attr(770,root,ntop) %dir %{_localstatedir}/ntop/rrd %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -169,6 +179,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.87 2010/04/06 22:08:10 glen +- symlink duplicate files, verbose files, enable snmp + Revision 1.86 2010/04/06 21:54:45 glen - two more patches from fc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntop/ntop.spec?r1=1.86&r2=1.87&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
