rpms/vnstat/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 vnstat.spec, 1.12, 1.13

[Adrian Reber]

Author: adrian

Update of /cvs/extras/rpms/vnstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6080

Modified Files:
	.cvsignore sources vnstat.spec 
Log Message:
* Mon Nov 09 2009 Adrian Reber <adrian at lisas.de> - 1.8-6
- to not activate vnstatd by default
- remove executable bit from perl cgi example
- do not package example startup scripts

* Wed Aug  5 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8-5
- update to 1.8
- add vnstatd, vnstati (by using default Makefile install target)
- add initscript for vnstatd



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	13 Jan 2008 20:42:05 -0000	1.3
+++ .cvsignore	9 Nov 2009 10:22:13 -0000	1.4
@@ -1 +1 @@
-vnstat-1.6.tar.gz
+vnstat-1.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Jan 2008 20:42:05 -0000	1.3
+++ sources	9 Nov 2009 10:22:13 -0000	1.4
@@ -1 +1 @@
-ccaffe8e70d47e0cf2f25e52daa25712  vnstat-1.6.tar.gz
+99a30716b5013e7e249e500ee6ee2985  vnstat-1.8.tar.gz


Index: vnstat.spec
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/vnstat.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- vnstat.spec	27 Jul 2009 06:57:30 -0000	1.12
+++ vnstat.spec	9 Nov 2009 10:22:13 -0000	1.13
@@ -1,14 +1,19 @@
 Summary:	Console-based network traffic monitor
 Name:		vnstat
-Version:	1.6
-Release:	4%{?dist}
+Version:	1.8
+Release:	6%{?dist}
 
 License:	GPLv2
 Group:		System Environment/Daemons
 URL:		http://humdi.net/vnstat/
 Source:		http://humdi.net/vnstat/vnstat-%{version}.tar.gz
 Requires(pre):	/usr/sbin/useradd
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: gd-devel
 
 %description
 vnStat is a console-based network traffic monitor that keeps a log of daily
@@ -20,22 +25,27 @@ be used without root permissions. See th
 %setup -q
 # disable maximum bandwidth setting
 %{__sed} -i -e "s,MaxBandwidth 100,MaxBandwidth 0,g" cfg/vnstat.conf
+# no automatic runlevel
+%{__sed} -i -e "s,chkconfig: 2345 20 50,chkconfig: - 20 50," \
+            -e "s,Default-Start:     2 3 4 5,Default-Start:," \
+            -e "s,Default-Stop:      0 1 6,Default-Stop:," \
+  examples/init.d/fedora/vnstat
+# Use -p everywhere
+%{__sed} -i -e "s,install ,install -p ," Makefile
 
 %build
-%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+%{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" all
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-%{__mkdir_p} $RPM_BUILD_ROOT%{_bindir}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sbindir}
-%{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/man1
-%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
+%{__mkdir_p} $RPM_BUILD_ROOT%{_initddir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 
-%{__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}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__install} -p -m 755 examples/init.d/fedora/vnstat $RPM_BUILD_ROOT%{_initddir}
+%{__rm} -rf examples/init.d
+%{__chmod} 644 examples/vnstat.cgi
 
 %{__cat} >> $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name} << END
 MAILTO=root
@@ -79,18 +89,45 @@ END
 %{_sbindir}/useradd -r -s /sbin/nologin -d %{_localstatedir}/lib/%{name} \
 	-M -c "vnStat user" %{name} > /dev/null 2>&1 || :
 
+%post
+/sbin/chkconfig --add vnstat || :
+
+%preun
+if [ "$1" = 0 ] ; then
+  /sbin/service vnstat stop > /dev/null 2>&1
+  /sbin/chkconfig --del vnstat || :
+fi
+
+%postun
+if [ "$1" -ge 1 ]; then
+  /sbin/service vnstat try-restart >/dev/null 2>&1 || :
+fi
+
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COPYING FAQ README INSTALL cron pppd
+%doc CHANGES COPYING FAQ README INSTALL examples
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
+%{_initddir}/vnstat
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%{_mandir}/man1/*
-%{_bindir}/%{name}
+%{_mandir}/man*/*
+%{_bindir}/vnstat
+%{_bindir}/vnstati
+%{_sbindir}/vnstatd
 %attr(755,root,root)%{_sbindir}/%{name}.cron
 %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}
 
 %changelog
+* Mon Nov 09 2009 Adrian Reber <adrian at lisas.de> - 1.8-6
+- to not activate vnstatd by default
+- remove executable bit from perl cgi example
+- do not package example startup scripts
+
+* Wed Aug  5 2009 Axel Thimm <Axel.Thimm at ATrpms.net> - 1.8-5
+- update to 1.8
+- add vnstatd, vnstati (by using default Makefile install target)
+- add initscript for vnstatd
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild