[vnstat] spec cleanup

[Adrian Reber]

commit 1c96a62903badb2f32d9f675a4bee84fbadc0381
Author: Adrian Reber <adrian at lisas.de>
Date:   Fri Mar 8 12:16:48 2013 +0100

    spec cleanup

 vnstat.spec |   29 ++++-------------------------
 1 files changed, 4 insertions(+), 25 deletions(-)
---
diff --git a/vnstat.spec b/vnstat.spec
index be1236a..ae0686c 100644
--- a/vnstat.spec
+++ b/vnstat.spec
@@ -1,7 +1,7 @@
 Summary: Console-based network traffic monitor
 Name: vnstat
 Version: 1.11
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 License: GPLv2
 Group: System Environment/Daemons
@@ -9,14 +9,9 @@ URL: http://humdi.net/vnstat/
 Source0: http://humdi.net/vnstat/vnstat-%{version}.tar.gz
 Source1: vnstat.service
 Requires(pre): shadow-utils
-#Requires(post): chkconfig
-#Requires(preun): chkconfig
-#Requires(preun): initscripts
-#Requires(postun): initscripts
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gd-devel
 Patch0: vnstat-run-vnstat.diff
 
@@ -35,17 +30,6 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \
 	s,MaxBandwidth 100,MaxBandwidth 0,g;" \
 	cfg/vnstat.conf
 
-# no automatic runlevel
-#%{__sed} -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 > examples/init.d/fedora/vnstat.new
-#touch -r examples/init.d/fedora/vnstat{,.new}
-#%{__mv} -f examples/init.d/fedora/vnstat{.new,}
-
-# do not run vnstatd as the root user but as the vnstat user (#711995)
-#sed -i -e "s,daemon,daemon --user vnstat ,g" examples/init.d/fedora/vnstat
-
 # Use -p everywhere, -s nowhere
 %{__sed} -i -e "s,install \(-s \)\?,install -p ," Makefile
 
@@ -53,9 +37,7 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" all
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
-#%%{__mkdir_p} $RPM_BUILD_ROOT%%{_sysconfdir}/rc.d/init.d
 %{__mkdir_p} $RPM_BUILD_ROOT%{_unitdir}
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
@@ -64,8 +46,6 @@ sed -i -e "s,/var/run/,/run/vnstat/,g; \
 %{__install} -d -m 0700 %{buildroot}/run/%{name}/
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
-#%%{__install} -p -m 755 examples/init.d/fedora/vnstat \
-#  $RPM_BUILD_ROOT%%{_sysconfdir}/rc.d/init.d
 %{__install} -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/
 %{__rm} -rf examples/init.d
 %{__chmod} 644 examples/vnstat.cgi
@@ -110,9 +90,6 @@ END
 D /run/vnstat 0700 vnstat vnstat
 END
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
 %pre
 getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name}
 getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \
@@ -143,7 +120,6 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \
 %doc CHANGES COPYING FAQ README INSTALL examples
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/cron.d/%{name}
-#%%{_sysconfdir}/rc.d/init.d/%%{name}
 %{_unitdir}/%{name}.service
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_sysconfdir}/tmpfiles.d/vnstat.conf
@@ -156,6 +132,9 @@ getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -M \
 %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}
 
 %changelog
+* Fri Mar 08 2013 Adrian Reber <adrian at lisas.de> - 1.11-14
+- spec cleanup
+
 * Thu Mar 07 2013 Adrian Reber <adrian at lisas.de> - 1.11-13
 - fixed "/usr/sbin/vnstat.cron is incorrect" (#919157)