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

diff --git a/ntop.spec b/ntop.spec
index 0ee7779..7024d96 100644
--- a/ntop.spec
+++ b/ntop.spec
@@ -2,17 +2,15 @@ Summary:	Network monitoring tool
 Summary(pl):	Narzêdzie do monitorowania sieci
 Name:		ntop
 Version:	3.0
-Release:	0.2
+Release:	2
 License:	GPL
 Group:		Networking
 Source0:	http://dl.sourceforge.net/ntop/%{name}-%{version}.tgz
 # Source0-md5:	1ec6055c75f1acbb5d5600492481ef85
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-Source3:	%{name}.conf
-Patch0:		%{name}-acam.patch
-Patch1:		%{name}-externallib.patch
-Patch2:		%{name}-perl.patch
+Patch1:		%{name}-plugins_makefile.patch
+Patch2:		%{name}-conf.patch
 URL:		http://www.ntop.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -26,16 +24,19 @@ BuildRequires:	libtool
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	readline-devel >= 4.2
+BuildRequires:	rpmbuild(macros) >= 1.159
 BuildRequires:	zlib-devel
 PreReq:		rc-scripts
-Requires(pre):	/usr/bin/getgid
 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
@@ -48,21 +49,10 @@ robi to popularna Unixowa komenda top.
 
 %prep
 %setup -q
-#%%patch0 -p1
-#cd %{name}*
-#%%patch2 -p1
-#cd ../gdchart*
-#%%patch1 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-#cd gdchart*
-#rm -rf gd-* zlib-*
-#%%{__libtoolize}
-#%%{__aclocal}
-#%%{__autoconf}
-#%%configure
-#%%{__make}
-
 #mv -f acinclude.m4.in acinclude.m4
 #rm -f missing
 #%%{__libtoolize}
@@ -97,31 +87,33 @@ 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 %{SOURCE3} $RPM_BUILD_ROOT/etc/ntop.conf
+install packages/RedHat/ntop.conf.sample $RPM_BUILD_ROOT/etc/ntop.conf
+
+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
 
 %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
+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 -r -f ntop
+	/usr/sbin/groupadd -g 120 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
+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 -r -d /var/lib/ntop -s /bin/false -c "ntop User" -g ntop ntop 1>&2
+	/usr/sbin/useradd -u 120 -d /var/lib/ntop -s /bin/false \
+		-c "ntop User" -g ntop ntop 1>&2
 fi
 
 %post
@@ -135,31 +127,31 @@ 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
+	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
+	%userremove ntop
+	%groupremove ntop
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README THANKS
-#ntop/docs/1STRUN.TXT ntop/docs/FAQ
-%dir %{_var}/lib/%{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*
 %attr(755,root,root) %{_datadir}/%{name}
-#%%{_libdir}/lib*.la
 %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(644,ntop,ntop) %config(noreplace) %verify(not size mtime md5) /etc/ntop.conf
+%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