X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ntop.spec;h=7024d96a3493eb9709c7b91a529f041cdf529f65;hb=1b68ade4a1ae926934e0d9355f92934125d621cc;hp=8d4c699b691793da8a11b2ee143dd886667f2f74;hpb=b3e56ddd5425b440db1eef8ebc6109c98e1048f7;p=packages%2Fntop.git

diff --git a/ntop.spec b/ntop.spec
index 8d4c699..7024d96 100644
--- a/ntop.spec
+++ b/ntop.spec
@@ -1,33 +1,42 @@
-%define	snap	02-04-04
 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:	3.0
+Release:	2
 License:	GPL
 Group:		Networking
-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
-Patch4:		%{name}-plugins-Makefile.patch
-Patch5:		%{name}-pep-Makefile.patch
-Patch6:		%{name}-Makefile.patch
+Source0:	http://dl.sourceforge.net/ntop/%{name}-%{version}.tgz
+# Source0-md5:	1ec6055c75f1acbb5d5600492481ef85
+Source1:	%{name}.init
+Source2:	%{name}.sysconfig
+Patch1:		%{name}-plugins_makefile.patch
+Patch2:		%{name}-conf.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.7d
 BuildRequires:	readline-devel >= 4.2
-BuildRequires:	ucd-snmp-devel
+BuildRequires:	rpmbuild(macros) >= 1.159
 BuildRequires:	zlib-devel
+PreReq:		rc-scripts
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+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
+Provides:	group(ntop)
+Provides:	user(ntop)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,47 +48,33 @@ ntop to narz
 robi to popularna Unixowa komenda top.
 
 %prep
-%setup -q -n %{name}-current
-cd %{name}*
-rm -f missing ltconfig
-#%patch0 -p1
-%patch2 -p1
-%patch3 -p1
-cd ../gdchart*
+%setup -q
 %patch1 -p1
-cd ../%{name}*
-%patch6 -p0
-
-cd plugins
-
-%patch4 -p0
-cd pep
-%patch5 -p0
+%patch2 -p1
 
 %build
-cd gdchart*
-rm -rf gd-* zlib-*
-%{__libtoolize}
-aclocal
+#mv -f acinclude.m4.in acinclude.m4
+#rm -f missing
+#%%{__libtoolize}
+%{__aclocal}
 %{__autoconf}
-%configure
-%{__make}
+%{__automake}
+%configure \
+	--with-ossl-root=%{_prefix} \
+	--with-gdchart-root=`pwd`/../gdchart0.94c \
+	--enable-tcpwrap \
+	--with-gnu-ld \
+	--enable-i18n \
+	--enable-showoses \
+	--localstatedir=%{_var}/lib/%{name} || true
 
-cd ../%{name}*
-mv -f acinclude.m4.in acinclude.m4
-rm -f missing
-#libtoolize --copy --force
-aclocal
-%{__autoconf}
-# automake -a -c -f 
-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}
-	
+	--localstatedir=%{_var}/lib/%{name}
+
 
 %{__make}
 cd plugins
@@ -87,31 +82,76 @@ cd plugins
 
 %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}
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntop
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ntop
+install packages/RedHat/ntop.conf.sample $RPM_BUILD_ROOT/etc/ntop.conf
 
-gzip -9nf AUTHORS NEWS README THANKS
+mv $RPM_BUILD_ROOT%{_libdir}/lib*Plugin*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
 
 %clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
+
+%pre
+if [ -n "`/usr/bin/getgid ntop`" ]; then
+	if [ "`/usr/bin/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 ntop
+fi
+if [ -n "`/bin/id -u ntop 2>/dev/null`" ]; then
+	if [ "`/bin/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 -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
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+if [ "$1" = "0" ]; then
+	%userremove ntop
+	%groupremove ntop
+fi
 
 %files
 %defattr(644,root,root,755)
-%doc */*.gz
-%dir %{_var}/%{name}
+%doc AUTHORS ChangeLog NEWS README THANKS
+%attr(770,root,ntop) %dir %{_var}/lib/%{name}
 %attr(755,root,root) %{_bindir}/*
-%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/
-#%{_datadir}/%{name}
+%attr(755,root,root) %{_libdir}/lib*
+%attr(755,root,root) %{_datadir}/%{name}
+%dir %{_libdir}/%{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(750,root,ntop) %dir /etc/ntop
+%attr(640,root,ntop) %config(noreplace) %verify(not size mtime md5) /etc/ntop/*
+%attr(644,root,ntop) %config(noreplace) %verify(not size mtime md5) /etc/ntop.conf