- adapterized.

[packages/ntop.git] / ntop.spec

diff --git a/ntop.spec b/ntop.spec
index be7d8077608cf66d6f2c95fad3c92299e0ac0eed..5510bc0e7a0b21d04b72cc3dc720b694a73fb208 100644 (file)
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,21 +1,20 @@
-%define        snap    01-03-26
+%define        snap    01-10-26
 Summary:       Network monitoring tool
 Summary(pl):   Narzêdzie do monitorowania sieci
 Name:          ntop
 Version:       1.3.2
-Release:       2.%(echo %{snap} | sed -e "s/-//g")
+Release:       4.%(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
 Patch1:                %{name}-externallib.patch
 Patch2:                %{name}-perl.patch
+Patch3:                %{name}-am.patch
 URL:           http://www.ntop.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gd-devel >= 1.8.2
+BuildRequires: gd-devel >= 2.0.1
 BuildRequires: gdbm-devel
 BuildRequires: libpcap-devel
 BuildRequires: libpng-devel
@@ -40,30 +39,34 @@ robi to popularna Unixowa komenda top.
 %setup -q -n %{name}-current
 cd %{name}*
 rm -f missing ltconfig
-%patch0 -p1
+#%patch0 -p1
 %patch2 -p1
+%patch3 -p1
 cd ../gdchart*
 %patch1 -p1
 
 %build
 cd gdchart*
 rm -rf gd-* zlib-*
+libtoolize --copy --force
+aclocal
+autoconf
 %configure
 %{__make}
 
 cd ../%{name}*
+mv -f acinclude.m4.in acinclude.m4
 libtoolize --copy --force
-automake -a -c -i
-autoheader
 aclocal
 autoconf
+automake -a -c -i
 %configure \
        --with-gdchart-root=../gdchart0.94c \
        --with-ossl-root=%{_prefix} \
        --enable-tcpwrap \
        --with-gnu-ld \
        --localstatedir=%{_var}/%{ntop}
-       
+
 %{__make}
 
 %install
@@ -73,7 +76,7 @@ install -d    $RPM_BUILD_ROOT%{_var}/%{name}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
-       
+
 mv $RPM_BUILD_ROOT%{_bindir}/*.pem     $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 gzip -9nf AUTHORS NEWS README THANKS