rpms/vnstat/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 vnstat.spec, 1.8, 1.9 FAQ.vnstat, 1.1, NONE

[Adrian Reber (adrian)]

Author: adrian

Update of /cvs/extras/rpms/vnstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25178

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/devel/.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	13 Jan 2008 20:42:05 -0000	1.3
@@ -1 +1 @@
-vnstat-1.4.tar.gz
+vnstat-1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/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	13 Jan 2008 20:42:05 -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/devel/vnstat.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vnstat.spec	11 Oct 2007 16:56:59 -0000	1.8
+++ vnstat.spec	13 Jan 2008 20:42:05 -0000	1.9
@@ -1,13 +1,12 @@
 Summary:	Console-based network traffic monitor
 Name:		vnstat
-Version:	1.4
-Release:	10%{?dist}
+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)
 
@@ -19,8 +18,8 @@
 
 %prep
 %setup -q
-%{__cp} %{SOURCE1} FAQ
-%{__sed} -i 's/ifconfig/ip addr show/' src/vnstat.c
+# disable maximum bandwidth setting
+%{__sed} -i -e "s,MaxBandwidth 100,MaxBandwidth 0,g" cfg/vnstat.conf
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -34,8 +33,9 @@
 %{__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
@@ -45,6 +45,10 @@
 
 %{__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
@@ -60,7 +64,7 @@
 VNSTAT_CONF=%{_sysconfdir}/sysconfig/%{name}
 
 if [ ! -f $VNSTAT_CONF ]; then
-        exit 0
+	exit 0
 fi
 
 . \$VNSTAT_CONF
@@ -78,6 +82,7 @@
 %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,6 +91,11 @@
 %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
@@ -110,16 +120,16 @@
 
 * 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 ---