-%define snap 01-10-26
+%define snap 03-02-13
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.7.%(echo %{snap} | sed -e "s/-//g")
License: GPL
Group: Networking
Source0: http://snapshot.ntop.org/tgz/%{name}-%{snap}.tgz
-Patch0: %{name}-configure.patch
+Patch0: %{name}-acam.patch
Patch1: %{name}-externallib.patch
Patch2: %{name}-perl.patch
-Patch3: %{name}-am.patch
URL: http://www.ntop.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libwrap-devel
BuildRequires: libtool
BuildRequires: ncurses-devel >= 5.2
-BuildRequires: openssl-devel >= 0.9.6a
+BuildRequires: openssl-devel >= 0.9.7
BuildRequires: readline-devel >= 4.2
-BuildRequires: ucd-snmp-devel
+BuildRequires: net-snmp-devel
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%prep
%setup -q -n %{name}-current
+#%%patch0 -p1
cd %{name}*
-rm -f missing ltconfig
-#%patch0 -p1
%patch2 -p1
-%patch3 -p1
cd ../gdchart*
%patch1 -p1
%build
cd gdchart*
rm -rf gd-* zlib-*
-libtoolize --copy --force
-aclocal
-autoconf
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
%configure
%{__make}
cd ../%{name}*
-mv -f acinclude.m4.in acinclude.m4
-libtoolize --copy --force
-aclocal
-autoconf
-automake -a -c -i
+#mv -f acinclude.m4.in acinclude.m4
+#rm -f missing
+#%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
%configure \
- --with-gdchart-root=../gdchart0.94c \
--with-ossl-root=%{_prefix} \
+ --with-gdchart-root=`pwd`/../gdchart0.94c \
--enable-tcpwrap \
--with-gnu-ld \
- --localstatedir=%{_var}/%{ntop}
-
+ --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}
+
+
+%{__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
%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}/lib*
+#%attr(755,root,root) /usr/share/ntop/*
+%attr(755,root,root) %{_datadir}/%{name}
+#%{_libdir}/lib*.la
+#%dir %{_libdir}/%{name}
+#%dir %{_libdir}/%{name}/plugins
+%attr(755,root,root) %{_libdir}/%{name}/plugins
%{_mandir}/man*/*