- Add require lib

[packages/ntop.git] / ntop.spec

diff --git a/ntop.spec b/ntop.spec
index 21d39353f792d924111cdb464328cfa27c5e2885..ae0b1c3217fcda1d7d2ef4d9c953f2e4c8c19a62 100644 (file)
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,25 +1,26 @@
-%define        snap    02-03-24
+%define        snap    02-10-03
 Summary:       Network monitoring tool
 Summary(pl):   Narzêdzie do monitorowania sieci
 Name:          ntop
-Version:       2.0
-Release:       0.1.%(echo %{snap} | sed -e "s/-//g")
+Version:       2.1
+Release:       0.5.%(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}-configure.patch
 Patch1:                %{name}-externallib.patch
 Patch2:                %{name}-perl.patch
 Patch3:                %{name}-am.patch
-Patch4:                %{name}-plugins-Makefile.patch
+#Patch4:               %{name}-plugins-Makefile.patch
 Patch5:                %{name}-pep-Makefile.patch
-Patch6:                %{name}-Makefile-version.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
@@ -41,7 +42,7 @@ robi to popularna Unixowa komenda top.
 %prep
 %setup -q -n %{name}-current
 cd %{name}*
-rm -f missing ltconfig
+#rm -f missing ltconfig
 #%patch0 -p1
 %patch2 -p1
 %patch3 -p1
@@ -51,61 +52,61 @@ cd ../%{name}*
 %patch6 -p0
 
 cd plugins
-%patch4 -p0
+#%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
-rm -f missing
-libtoolize --copy --force
+#mv -f acinclude.m4.in acinclude.m4
+#rm -f missing
+#%{__libtoolize}
 aclocal
-autoconf
-automake -a -c -f 
+%{__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
-
 %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
+%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/