Author: glen Date: Mon Jan 2 01:02:44 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 3.2
---- Files affected: SPECS: ntop.spec (1.67 -> 1.68) ---- Diffs: ================================================================ Index: SPECS/ntop.spec diff -u SPECS/ntop.spec:1.67 SPECS/ntop.spec:1.68 --- SPECS/ntop.spec:1.67 Thu May 19 12:13:09 2005 +++ SPECS/ntop.spec Mon Jan 2 02:02:38 2006 @@ -1,26 +1,24 @@ # $Revision$, $Date$ # TODO: -# - service ntop init steals terminal (it doesnt finish nor background) +# - service ntop init steals terminal (it doesn't finish nor background) # - paths wrong somewhere /var/lib/ntop/ntop is expected (should be without last path component) # - /var/lib/ntop/* should be %ghost -# - .la files should be in -devel -# - ntop apperars to be daemon, so it should be in _sbindir not in _bindir -# Summary: Network monitoring tool Summary(pl): Narzędzie do monitorowania sieci Name: ntop -Version: 3.1 -Release: 0.2 +Version: 3.2 +Release: 0.6 License: GPL Group: Networking Source0: http://dl.sourceforge.net/ntop/%{name}-%{version}.tgz -# Source0-md5: 1c9b4097c2e464b84f2fe8f6626d2b06 +# Source0-md5: cd29a876b34a7dd76555e9acd8f160bb Source1: %{name}.init Source2: %{name}.sysconfig Patch0: %{name}-plugins_makefile.patch Patch1: %{name}-conf.patch -Patch2: %{name}-DESTDIR.patch -Patch3: %{name}-nolibs.patch +Patch2: %{name}-nolibs.patch +Patch3: %{name}-config.patch +Patch4: %{name}-am.patch URL: http://www.ntop.org/ BuildRequires: autoconf BuildRequires: automake @@ -42,15 +40,15 @@ #BuildRequires: gdome2-devel #BuildRequires: glib-devel #BuildRequires: libxml2-devel -PreReq: rc-scripts +Requires(post,postun): /sbin/ldconfig +Requires(post,preun): /sbin/chkconfig +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -Requires(post,preun): /sbin/chkconfig -Requires(post,postun): /sbin/ldconfig -Requires(postun): /usr/sbin/groupdel -Requires(postun): /usr/sbin/userdel +Requires: rc-scripts Provides: group(ntop) Provides: user(ntop) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -66,11 +64,12 @@ robi to popularna uniksowa komenda top. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # kill libtool.m4 copy cp -f acinclude.m4.ntop acinclude.m4 @@ -93,16 +92,17 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_localstatedir},/etc/{rc.d/init.d,sysconfig}} +install -d $RPM_BUILD_ROOT{%{_localstatedir},/etc/{rc.d/init.d,sysconfig},%{_sbindir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntop install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ntop -install packages/RedHat/ntop.conf.sample $RPM_BUILD_ROOT/etc/ntop.conf +install packages/RedHat/ntop.conf.sample $RPM_BUILD_ROOT%{_sysconfdir}/ntop.conf -mv $RPM_BUILD_ROOT%{_libdir}/lib*Plugin*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins +# no -devel +rm -f $RPM_BUILD_ROOT%{_libdir}{,/ntop/plugins}/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -139,17 +139,17 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README THANKS %attr(770,root,ntop) %dir %{_localstatedir} -%attr(755,root,root) %{_bindir}/* -%attr(755,root,root) %{_libdir}/lib* +%attr(755,root,root) %{_sbindir}/* +%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) /etc/sysconfig/ntop -%attr(750,root,ntop) %dir /etc/ntop -%attr(640,root,ntop) %config(noreplace) %verify(not md5 mtime size) /etc/ntop/* -%attr(644,root,ntop) %config(noreplace) %verify(not md5 mtime size) /etc/ntop.conf +%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 %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -157,6 +157,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.68 2006/01/02 01:02:38 glen +- updated to 3.2 + Revision 1.67 2005/05/19 10:13:09 qboosh - added nolibs patch, some spec cleanups ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ntop.spec?r1=1.67&r2=1.68&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
