SPECS: ntop.spec - fix desynchronized _localstatedir between spec ...

[glen]

Author: glen                         Date: Tue Jan  3 11:55:08 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix desynchronized _localstatedir between spec and configure

---- Files affected:
SPECS:
   ntop.spec (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: SPECS/ntop.spec
diff -u SPECS/ntop.spec:1.70 SPECS/ntop.spec:1.71
--- SPECS/ntop.spec:1.70	Mon Jan  2 15:14:47 2006
+++ SPECS/ntop.spec	Tue Jan  3 12:55:03 2006
@@ -1,11 +1,9 @@
 # $Revision$, $Date$
-# TODO:
-#  - paths wrong somewhere /var/lib/ntop/ntop is expected (should be without last path component)
 Summary:	Network monitoring tool
 Summary(pl):	Narzędzie do monitorowania sieci
 Name:		ntop
 Version:	3.2
-Release:	0.8
+Release:	0.9
 License:	GPL
 Group:		Networking
 Source0:	http://dl.sourceforge.net/ntop/%{name}-%{version}.tgz
@@ -49,7 +47,7 @@
 Provides:	user(ntop)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_localstatedir		/var/lib/ntop
+%define		_localstatedir		/var/lib
 
 %description
 ntop is a tool that shows the network usage, similar to what the
@@ -88,7 +86,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_localstatedir}/rrd,/etc/{rc.d/init.d,sysconfig},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_localstatedir}/ntop/rrd,/etc/{rc.d/init.d,sysconfig},%{_sbindir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -105,7 +103,7 @@
 
 %pre
 %groupadd -g 120 ntop
-%useradd -u 120 -d %{_localstatedir} -s /bin/false -c "ntop User" -g ntop ntop
+%useradd -u 120 -d %{_localstatedir}/ntop -s /bin/false -c "ntop User" -g ntop ntop
 
 %post
 /sbin/ldconfig
@@ -134,8 +132,8 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS docs/{1STRUN.txt,FAQ}
-%attr(770,root,ntop) %dir %{_localstatedir}
-%attr(770,root,ntop) %dir %{_localstatedir}/rrd
+%attr(770,root,ntop) %dir %{_localstatedir}/ntop
+%attr(770,root,ntop) %dir %{_localstatedir}/ntop/rrd
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_datadir}/%{name}
@@ -154,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2006/01/03 11:55:03  glen
+- fix desynchronized _localstatedir between spec and configure
+
 Revision 1.70  2006/01/02 14:14:47  glen
 - merged few changes from dead DEVEL 1.51.2.2 branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ntop.spec?r1=1.70&r2=1.71&f=u