-%define snap 03-02-13
Summary: Network monitoring tool
-Summary(pl): Narzêdzie do monitorowania sieci
+Summary(pl.UTF-8): Narzędzie do monitorowania sieci
Name: ntop
-Version: 2.2
-Release: 0.1
+Version: 3.2
+Release: 2
License: GPL
Group: Networking
-Source0: http://snapshot.ntop.org/tgz/%{name}-%{version}.tgz
-# Source0-md5: 4586e4173fcab64d2394502603fc73aa
-Patch0: %{name}-acam.patch
-Patch1: %{name}-externallib.patch
-Patch2: %{name}-perl.patch
+Source0: http://dl.sourceforge.net/ntop/%{name}-%{version}.tgz
+# Source0-md5: cd29a876b34a7dd76555e9acd8f160bb
+Source1: %{name}.init
+Source2: %{name}.sysconfig
+Patch0: %{name}-plugins_makefile.patch
+Patch1: %{name}-conf.patch
+Patch2: %{name}-nolibs.patch
+Patch3: %{name}-config.patch
+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
+BuildRequires: gdome2-devel
+BuildRequires: glib2-devel
BuildRequires: libpcap-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
-BuildRequires: libwrap-devel
BuildRequires: libtool
+BuildRequires: libwrap-devel
BuildRequires: ncurses-devel >= 5.2
-BuildRequires: openssl-devel >= 0.9.7
+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
+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: rc-scripts
+Provides: group(ntop)
+Provides: user(ntop)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _localstatedir /var/lib
+
%description
ntop is a tool that shows the network usage, similar to what the
popular top Unix command does.
-%description -l pl
-ntop to narzêdzie, które pokazuje u¿ycie sieci w podobny sposób jak
-robi to popularna Unixowa komenda top.
+%description -l pl.UTF-8
+ntop to narzędzie, które pokazuje użycie sieci w podobny sposób jak
+robi to popularna uniksowa komenda top.
%prep
%setup -q
-#%%patch0 -p1
-cd %{name}*
-%patch2 -p1
-cd ../gdchart*
+%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+# kill libtool.m4 copy
+cp -f acinclude.m4.ntop acinclude.m4
%build
-cd gdchart*
-rm -rf gd-* zlib-*
%{__libtoolize}
%{__aclocal}
%{__autoconf}
-%configure
-%{__make}
-
-cd ../%{name}*
-#mv -f acinclude.m4.in acinclude.m4
-#rm -f missing
-#%%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
%{__automake}
+# "verified.awk -u" calls require gawk
%configure \
- --with-ossl-root=%{_prefix} \
- --with-gdchart-root=`pwd`/../gdchart0.94c \
- --enable-tcpwrap \
+ AWK=gawk \
+ --disable-static \
+ --enable-i18n \
--with-gnu-ld \
- --localstatedir=%{_var}/lib/%{name} || true
-
-%configure \
--with-ossl-root=%{_prefix} \
- --with-gdchart-root=`pwd`/../gdchart0.94c \
- --enable-tcpwrap \
- --with-gnu-ld \
- --localstatedir=%{_var}/lib/%{name}
-
+ --with-tcpwrap
-%{__make}
-cd plugins
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-cd %{name}*
-install -d $RPM_BUILD_ROOT%{_var}/lib/%{name}
+install -d $RPM_BUILD_ROOT{%{_localstatedir}/ntop/rrd,/etc/{rc.d/init.d,sysconfig},%{_sbindir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-#mv $RPM_BUILD_ROOT%{_bindir}/*.pem $RPM_BUILD_ROOT%{_datadir}/%{name}
+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%{_sysconfdir}/ntop.conf
+
+# no -devel
+rm -f $RPM_BUILD_ROOT%{_libdir}{,/ntop/plugins}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%pre
+%groupadd -g 120 ntop
+%useradd -u 120 -d %{_localstatedir}/ntop -s /bin/false -c "ntop User" -g ntop ntop
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add ntop
+%service ntop restart "ntop daemon"
+
+%preun
+if [ "$1" = "0" ]; then
+ %service ntop stop
+ /sbin/chkconfig --del ntop
+fi
+
+%postun
+/sbin/ldconfig
+if [ "$1" = "0" ]; then
+ %userremove ntop
+ %groupremove ntop
+fi
%files
%defattr(644,root,root,755)
-%doc ntop/AUTHORS ntop/NEWS ntop/README ntop/THANKS
-%dir %{_var}/lib/%{name}
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*
-#%attr(755,root,root) /usr/share/ntop/*
+%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(755,root,root) %{_libdir}/lib*.so
%attr(755,root,root) %{_datadir}/%{name}
-#%%{_libdir}/lib*.la
-#%dir %{_libdir}/%{name}
-#%dir %{_libdir}/%{name}/plugins
+%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