rpms/vnstat/EL-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vnstat.spec, 1.2, 1.3 FAQ.vnstat, 1.1, NONE

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/vnstat/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9847

Modified Files:
	.cvsignore sources vnstat.spec 
Removed Files:
	FAQ.vnstat 
Log Message:
* Sun Jan 13 2008 Adrian Reber <adrian at lisas.de> - 1.6-1
- updated to 1.6
- added vnstat.conf to %{_sysconfdir}
- fixed a few rpmlint warnings



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vnstat/EL-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Mar 2005 18:37:42 -0000	1.2
+++ .cvsignore	15 Jan 2008 21:06:40 -0000	1.3
@@ -1 +1 @@
-vnstat-1.4.tar.gz
+vnstat-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vnstat/EL-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Mar 2005 18:37:42 -0000	1.2
+++ sources	15 Jan 2008 21:06:40 -0000	1.3
@@ -1 +1 @@
-9184f79b5e60499bc059f670032291e5  vnstat-1.4.tar.gz
+ccaffe8e70d47e0cf2f25e52daa25712  vnstat-1.6.tar.gz


Index: vnstat.spec
===================================================================
RCS file: /cvs/extras/rpms/vnstat/EL-4/vnstat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vnstat.spec	5 Mar 2005 21:10:25 -0000	1.2
+++ vnstat.spec	15 Jan 2008 21:06:40 -0000	1.3
@@ -1,22 +1,25 @@
 Summary:	Console-based network traffic monitor
 Name:		vnstat
-Version:	1.4
-Release:	3
-License:	GPL
+Version:	1.6
+Release:	1%{?dist}
+
+License:	GPLv2
 Group:		System Environment/Daemons
 URL:		http://humdi.net/vnstat/
-Source0:	http://humdi.net/vnstat/vnstat-%{version}.tar.gz
-Source1:	FAQ.vnstat
+Source:		http://humdi.net/vnstat/vnstat-%{version}.tar.gz
+Requires(pre):	/usr/sbin/useradd
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-vnStat is a console-based network traffic monitor that uses the
-/proc -filesystem to get the needed information. This means that vnStat wont
-actually be sniffing any traffic. See the webpage for few 'screenshots'.
+vnStat is a console-based network traffic monitor that keeps a log of daily
+network traffic for the selected interface(s). vnStat isn't a packet sniffer.
+The traffic information is analyzed from the /proc-filesystem, so vnStat can
+be used without root permissions. See the webpage for few 'screenshots'.
 
 %prep
 %setup -q
-%{__cp} %{SOURCE1} FAQ
+# disable maximum bandwidth setting
+%{__sed} -i -e "s,MaxBandwidth 100,MaxBandwidth 0,g" cfg/vnstat.conf
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -30,17 +33,22 @@
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 
-%{__install} -m 644 man/vnstat.1 $RPM_BUILD_ROOT%{_mandir}/man1
-%{__install} -m 755 src/vnstat $RPM_BUILD_ROOT%{_bindir}
+%{__install} -p -m 644 man/vnstat.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%{__install} -p -m 755 src/vnstat $RPM_BUILD_ROOT%{_bindir}
+%{__install} -p -m 644 cfg/vnstat.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name} << END
 MAILTO=root
-# to enable intrerface monitoring via vnstat remove comment on next line
+# to enable interface monitoring via vnstat remove comment on next line
 # */5 * * * *  vnstat %{_sbindir}/%{name}.cron
 END
 
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name} << END
 # see also: vnstat(1)
+#
+# starting with vnstat-1.6 vnstat can also be
+# configured via %{_sysconfdir}/vnstat.conf
+#
 # the following sets vnstat up to monitor eth0
 VNSTAT_OPTIONS="-u -i eth0"
 END
@@ -56,7 +64,7 @@
 VNSTAT_CONF=%{_sysconfdir}/sysconfig/%{name}
 
 if [ ! -f $VNSTAT_CONF ]; then
-        exit 0
+	exit 0
 fi
 
 . \$VNSTAT_CONF
@@ -68,16 +76,13 @@
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %pre
-useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/%{name} -c 'vnstat user' %{name} >/dev/null 2>&1 ||:
-
-%preun
-if [ "$1" -eq "0" ]; then
-        userdel %{name}
-fi
+%{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/%{name} \
+	-M -c "vnStat user" %{name} > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root,-)
 %doc CHANGES COPYING FAQ README INSTALL cron pppd
+%config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_mandir}/man1/*
@@ -86,18 +91,45 @@
 %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}
 
 %changelog
+* Sun Jan 13 2008 Adrian Reber <adrian at lisas.de> - 1.6-1
+- updated to 1.6
+- added vnstat.conf to %%{_sysconfdir}
+- fixed a few rpmlint warnings
+
+* Thu Oct 11 2007 Adrian Reber <adrian at lisas.de> - 1.4-10
+- rebuilt for BuildID
+- updated license tag
+
+* Mon Feb 26 2007 Adrian Reber <adrian at lisas.de> - 1.4-9
+- applied patch for spec file cleanup (#229037)
+
+* Fri Sep 15 2006 Adrian Reber <adrian at lisas.de> - 1.4-8
+- rebuilt
+
+* Fri Mar 18 2006 Adrian Reber <adrian at lisas.de> - 1.4-7
+- rebuilt; fixed dist tag
+
+* Fri Mar 18 2006 Adrian Reber <adrian at lisas.de> - 1.4-6
+- rebuilt
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.4-5
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Mon Feb 28 2005 Adrian Reber <adrian at lisas.de> 1.4-3
 - removed occurences of VNSTAT_DISABLED in
-  %{_sysconfdir}/sysconfig/%{name} and
-  %{_sbindir}/%{name}.cron 
+  %%{_sysconfdir}/sysconfig/%%{name} and
+  %%{_sbindir}/%{name}.cron 
 
 * Thu Feb 24 2005 Adrian Reber <adrian at lisas.de> 1.4-2
 - removed "#--------------"
 - added %%{version} to Source0
 - replaced almost empty FAQ with the one from the web
 - added INSTALL to %%doc
-- added %{_sysconfdir}/sysconfig/%{name}
-  and %{_sbindir}/%{name}.cron to allow flexible configuration
+- added %%{_sysconfdir}/sysconfig/%%{name}
+  and %%{_sbindir}/%%{name}.cron to allow flexible configuration
 - cron script and configuration file defaults to vnstat disabled
 - added example scripts from cron/* and pppd/* to %%doc
 


--- FAQ.vnstat DELETED ---