X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ntop.spec;h=6febba8831bb783358d444b84c143911fda23a0c;hb=88967d48ff33a2501ef4f6eb55bdb106c00b4ca2;hp=ffcddbbe5ab32d76e4ecc14d71114b8df2a0127b;hpb=2004f5a87f455375614ce2b04633605f6ef80440;p=packages%2Fntop.git

diff --git a/ntop.spec b/ntop.spec
index ffcddbb..6febba8 100644
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,30 +1,41 @@
-%define	snap	01-10-26
 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.2
+Release:	0.2
 License:	GPL
 Group:		Networking
-Source0:	http://snapshot.ntop.org/tgz/%{name}-%{snap}.tgz
-Patch0:		%{name}-configure.patch
+Source0:	http://dl.sourceforge.net/ntop/%{name}-%{version}.tgz
+# Source0-md5:	4586e4173fcab64d2394502603fc73aa
+Source1:	%{name}.init
+Source2:	%{name}.sysconfig
+Source3:	%{name}.conf
+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:	gd-devel >= 2.0.1
-BuildRequires:	gdbm-devel
+BuildRequires:	gdbm-devel >= 1.8.3
 BuildRequires:	libpcap-devel
 BuildRequires:	libpng-devel
+BuildRequires:	libtiff-devel
 BuildRequires:	libwrap-devel
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel >= 5.2
-BuildRequires:	openssl-devel >= 0.9.6a
+BuildRequires:	openssl-devel >= 0.9.7c
 BuildRequires:	readline-devel >= 4.2
-BuildRequires:	ucd-snmp-devel
 BuildRequires:	zlib-devel
+PreReq:		rc-scripts
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires(post,preun):	/sbin/chkconfig
+Requires(post,postun):	/sbin/ldconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,67 +47,121 @@ ntop to narz
 robi to popularna Unixowa komenda top.
 
 %prep
-%setup -q -n %{name}-current
+%setup -q
+#%%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}
-	
+	--enable-i18n \
+	--enable-showoses \
+	--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},/etc/{rc.d/init.d,sysconfig}}
 
 %{__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}
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntop
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ntop
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/ntop.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%pre
+if [ -n "`getgid ntop`" ]; then
+        if [ "`getgid ntop`" != "120" ]; then
+                echo "Error: group ntop doesn't have gid=120. Correct this before installing ntop." 1>&2
+                exit 1
+        fi
+else
+        /usr/sbin/groupadd -g 120 -r -f ntop
+fi
+if [ -n "`id -u ntop 2>/dev/null`" ]; then
+        if [ "`id -u ntop`" != "120" ]; then
+                echo "Error: user ntop doesn't have uid=120. Correct this before installing ntop." 1>&2
+                exit 1
+        fi
+else
+        /usr/sbin/useradd -u 120 -r -d /var/lib/ntop -s /bin/false -c "ntop User" -g ntop ntop 1>&2
+fi
+
+%post   
+/sbin/ldconfig
+/sbin/chkconfig --add ntop
+if [ -f /var/lock/subsys/ntop ]; then
+	/etc/rc.d/init.d/ntop restart >&2
+else
+	echo "Run \"/etc/rc.d/init.d/ntop start\" to start ntop daemon." >&2
+fi
+
+%preun
+if [ "$1" = "0" ]; then
+        if [ -f /var/lock/subsys/ntop ]; then
+                /etc/rc.d/init.d/ntop stop 1>&2
+        fi
+        /sbin/chkconfig --del ntop
+fi
+
+%postun 
+/sbin/ldconfig
+if [ "$1" = "0" ]; then
+        /usr/sbin/userdel ntop
+        /usr/sbin/groupdel ntop
+fi
 
 %files
 %defattr(644,root,root,755)
-%doc */*.gz
-%dir %{_var}/%{name}
+%doc ntop/AUTHORS ntop/NEWS ntop/README ntop/THANKS 
+#ntop/docs/1STRUN.TXT ntop/docs/FAQ
+%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) %{_datadir}/%{name}
+#%%{_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}/%{name}/plugins
 %{_mandir}/man*/*
+%attr(754,root,root) /etc/rc.d/init.d/ntop
+%attr(640,root,root) /etc/sysconfig/ntop
+%attr(644,ntop,ntop) %config(noreplace) %verify(not size mtime md5) /etc/ntop.conf