new snapshot

Changed files:
    ntop.spec -> 1.4

diff --git a/ntop.spec b/ntop.spec
index e695643841ccfd7c469f6c293d08ebb59e6e4cc8..3139f298698ef68fbc1b1a6228850c75a10b38e9 100644 (file)
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,15 +1,17 @@
+%define        snap    01-03-26
 Summary:       Network monitoring tool
 Summary(pl):   Narzêdzie do monitorowania sieci
 Name:          ntop
 Version:       1.3.2
-Release:       1
+Release:       0.%(echo %{snap} | sed -e "s/-//g")
 License:       GPL
 Group:         Networking
 Group(de):     Netzwerkwesen
 Group(pl):     Sieciowe
-Source0:       ftp://ftp.ntop.org/pub/local/ntop/snapshots/%{name}-src-Oct-26-2000.tar.gz
+Source0:       http://snapshot.ntop.org/tgz/%{name}-%{snap}.tgz
 Patch0:                %{name}-configure.patch
-Patch1:                %{name}-plugins.patch
+Patch1:                %{name}-externallib.patch
+Patch2:                %{name}-perl.patch
 URL:           http://www.ntop.org/
 BuildRequires: libpcap-devel
 BuildRequires: libwrap-devel
@@ -17,7 +19,13 @@ BuildRequires:       ncurses-devel
 BuildRequires: readline-devel
 BuildRequires: openssl-devel
 BuildRequires: ucd-snmp-devel
-BuildRequires: tar
+BuildRequires: gd-devel >= 1.8.2
+BuildRequires: gdbm-devel
+BuildRequires: libpng-devel
+BuildRequires: zlib-devel
+BuildRequires: libtool
+BuildRequires: automake
+BuildRequires: autoconf
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -29,54 +37,63 @@ ntop to narz
 robi to popularna Unixowa komenda top.
 
 %prep
-%setup -q -c
-tar xzf %{name}-*.tar.gz
-tar xzf gdchart*.tar.gz
-rm -f *.tar.gz
-cd %{name}-%{version}
+%setup -q -n %{name}-current
+cd %{name}*
+rm -f missing ltconfig
 %patch0 -p1
+%patch2 -p1
+cd ../gdchart*
 %patch1 -p1
 
 %build
 cd gdchart*
+rm -rf gd-* zlib-*
 %configure
 %{__make}
 
-cd ../%{name}-%{version}
+cd ../%{name}*
 libtoolize --copy --force
-aclocal
+automake -a -c -i
 autoheader
-automake --add-missing --gnu
+aclocal
 autoconf
 %configure \
-       --with-gdchart-root=../gdchart* \
+       --with-gdchart-root=../gdchart0.94c \
        --with-ossl-root=%{_prefix} \
        --enable-tcpwrap \
-       --disable-mt \
+       --with-gnu-ld \
        --localstatedir=%{_var}/%{ntop}
        
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{name}-%{version}
-rm -rf $RPM_BUILD_ROOT
+cd %{name}*
+install -d     $RPM_BUILD_ROOT%{_var}/%{name}
 
-install -d $RPM_BUILD_ROOT%{_var}/%{name}
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_bindir}/*.pem
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+       
+mv $RPM_BUILD_ROOT%{_bindir}/*.pem     $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-gzip -9nf AUTHORS FAQ KNOWN_BUGS NEWS README THANKS TODO
+gzip -9nf AUTHORS NEWS README THANKS
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc */*.gz
 %dir %{_var}/%{name}
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*
-%{_libdir}/%{name}
+%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}
 %{_mandir}/man*/*