- updated to 03-02-13 snapshost

[packages/ntop.git] / ntop.spec

diff --git a/ntop.spec b/ntop.spec
index bbd716d6ad14dff0fbb5cbece218d0d357c53d9f..4ae2393c9aa21bc558fa16071bba4a3ac1c7dafb 100644 (file)
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,19 +1,15 @@
-%define        snap    02-04-04
+%define        snap    03-02-13
 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.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
-Patch4:                %{name}-plugins-Makefile.patch
-Patch5:                %{name}-pep-Makefile.patch
-Patch6:                %{name}-Makefile.patch
 URL:           http://www.ntop.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -24,9 +20,9 @@ BuildRequires:        libpng-devel
 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)
 
@@ -40,45 +36,42 @@ robi to popularna Unixowa komenda top.
 
 %prep
 %setup -q -n %{name}-current
+#%%patch0 -p1
 cd %{name}*
-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}
-aclocal
+%{__aclocal}
 %{__autoconf}
 %configure
 %{__make}
 
 cd ../%{name}*
-mv -f acinclude.m4.in acinclude.m4
-rm -f missing
+#mv -f acinclude.m4.in acinclude.m4
+#rm -f missing
 #%{__libtoolize}
-aclocal
+%{__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}/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
@@ -92,23 +85,24 @@ 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}
+#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 AUTHORS NEWS README THANKS
+%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}/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/
-#%{_datadir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/plugins
 %{_mandir}/man*/*