-%define snap 01-10-26
+%define snap 02-10-03
Summary: Network monitoring tool
Summary(pl): Narzêdzie do monitorowania sieci
Name: ntop
-Version: 1.3.2
-Release: 4.%(echo %{snap} | sed -e "s/-//g")
+Version: 2.1
+Release: 0.5.%(echo %{snap} | sed -e "s/-//g")
License: GPL
Group: Networking
-Group(de): Netzwerkwesen
-Group(pl): Sieciowe
Source0: http://snapshot.ntop.org/tgz/%{name}-%{snap}.tgz
-Patch0: %{name}-configure.patch
+#Patch0: %{name}-configure.patch
Patch1: %{name}-externallib.patch
Patch2: %{name}-perl.patch
Patch3: %{name}-am.patch
+#Patch4: %{name}-plugins-Makefile.patch
+Patch5: %{name}-pep-Makefile.patch
+Patch6: %{name}-Makefile.patch
URL: http://www.ntop.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gd-devel >= 2.0.1
BuildRequires: gdbm-devel
BuildRequires: libpcap-devel
+BuildRequires: libpcap-static
BuildRequires: libpng-devel
BuildRequires: libwrap-devel
BuildRequires: libtool
%prep
%setup -q -n %{name}-current
cd %{name}*
-rm -f missing ltconfig
+#rm -f missing ltconfig
#%patch0 -p1
%patch2 -p1
%patch3 -p1
cd ../gdchart*
%patch1 -p1
+cd ../%{name}*
+%patch6 -p0
+
+cd plugins
+#%patch4 -p0
+cd pep
+%patch5 -p0
%build
cd gdchart*
rm -rf gd-* zlib-*
-libtoolize --copy --force
+%{__libtoolize}
aclocal
-autoconf
+%{__autoconf}
%configure
%{__make}
cd ../%{name}*
-mv -f acinclude.m4.in acinclude.m4
-libtoolize --copy --force
+#mv -f acinclude.m4.in acinclude.m4
+#rm -f missing
+#%{__libtoolize}
aclocal
-autoconf
-automake -a -c -i
+%{__autoconf}
+%{__automake}
%configure \
--with-gdchart-root=../gdchart0.94c \
--with-ossl-root=%{_prefix} \
--enable-tcpwrap \
--with-gnu-ld \
- --localstatedir=%{_var}/%{ntop}
+ --localstatedir=%{_var}/lib/%{name}
+
+%{__make}
+cd plugins
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
cd %{name}*
-install -d $RPM_BUILD_ROOT%{_var}/%{name}
+install -d $RPM_BUILD_ROOT%{_var}/lib/%{name}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-
-mv $RPM_BUILD_ROOT%{_bindir}/*.pem $RPM_BUILD_ROOT%{_datadir}/%{name}
-gzip -9nf AUTHORS NEWS README THANKS
+mv $RPM_BUILD_ROOT%{_bindir}/*.pem $RPM_BUILD_ROOT%{_datadir}/%{name}
%clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
-%doc */*.gz
-%dir %{_var}/%{name}
+%doc ntop/AUTHORS ntop/NEWS ntop/README ntop/THANKS
+%dir %{_var}/lib/%{name}
%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%attr(755,root,root) %{_libdir}/lib*.la
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so*
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.la
-%{_datadir}/%{name}
+%attr(755,root,root) %{_libdir}/*
+#%attr(755,root,root) %{_libdir}/lib*.la
+#%dir %{_libdir}/%{name}
+#%dir %{_libdir}/%{name}/plugins
+#%attr(755,root,root) %{_libdir}/%{name}/plugins/
+#%{_datadir}/%{name}
%{_mandir}/man*/*