Merge Review and spec cleanup

mrtg.spec

@@ -6,7 +6,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.16.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://oss.oetiker.ch/mrtg/
 Source0:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
 #Source1:   http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5.gpg
@@ -17,9 +17,9 @@ Source5:   mrtg-httpd.conf
 Source6:   filter-provides-mrtg.sh
 Patch0:    mrtg-2.15.0-lib64.patch
 Patch1:    mrtg-2.10.5-norpath.patch
-License:   GPL+
+License:   GPLv2+
 Group:     Applications/Internet
-PreReq:    vixie-cron
+Requires:  vixie-cron
 Requires(post): /sbin/service
 Requires(postun): /sbin/service
 Requires:  perl-Socket6 perl-IO-Socket-INET6
@@ -40,9 +40,9 @@ images which provide a LIVE visual representation of this traffic.
 %patch0 -p1 -b .lib64
 %patch1 -p1
 
-for i in doc/mrtg-forum.1 doc/mrtg-squid.1; do
-	iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
-	mv "${i}_" "$i"
+for i in doc/mrtg-forum.1 doc/mrtg-squid.1 CHANGES; do
+    iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
+    mv "${i}_" "$i"
 done
 
 %build
@@ -51,7 +51,7 @@ done
 # LIBS derived from autodetected by removing -Wl,-B(static|dynamic), -lpng, -lz
 make LIBS='-lgd -lm'
 find contrib -type f -exec \
-	%{__perl} -e 's,^#!/\s*\S*perl\S*,#!%{__perl},gi' -p -i \{\} \;
+    %{__perl} -e 's,^#!/\s*\S*perl\S*,#!%{__perl},gi' -p -i \{\} \;
 find contrib -name "*.pl" -exec %{__perl} -e 's;\015;;gi' -p -i \{\} \;
 find contrib -type f | xargs chmod a-x
 
@@ -68,18 +68,18 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
 
 install -m 644 images/*   $RPM_BUILD_ROOT%{contentdir}/
 sed 's,@CONTENTDIR@,%{contentdir},g; s,@LIBDIR@,%{_localstatedir}/lib/mrtg,g' \
-	%{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg
+    %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg
 sed -e 's,@bindir@,%{_bindir},g; s,@sysconfdir@,%{_sysconfdir},g;' \
-	-e 's,@localstatedir@,%{_localstatedir},g' %{SOURCE4} \
-	> $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg
+    -e 's,@localstatedir@,%{_localstatedir},g' %{SOURCE4} \
+    > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg
 chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg
 
 install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf
 
 # Add mrtg-traffic-sum here when upstream decides to install it
 for i in mrtg cfgmaker indexmaker mrtg-traffic-sum; do
-	sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_bindir}/"$i"
+    sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_bindir}/"$i"
 done
 
 sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_mandir}/man1/*.1
@@ -91,17 +91,11 @@ sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_mandir}/man1/*.1
 %postun
 /sbin/service crond condrestart 2>&1 > /dev/null || :
 
-# Add a trigger to remove the system crontab version of our tasks.
-%triggerun -- mrtg <= 2.9.17-12
-grep -v '* * * * root %{_bindir}/mrtg' /etc/crontab > /etc/crontab.new &&\
-cat /etc/crontab.new > /etc/crontab &&
-rm /etc/crontab.new
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc contrib CHANGES COPYING COPYRIGHT README THANKS
 %dir %{_sysconfdir}/mrtg
 %config(noreplace) %{_sysconfdir}/mrtg/mrtg.cfg
@@ -118,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/lock/mrtg
 
 %changelog
+* Thu Dec 11 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.16.2-2
+- Merge Review and spec cleanup
+  Resolves: #226161
+
 * Fri Jun 27 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.16.2-1
 - Update to 2.16.2
 - Mark /etc/crond.d/mrtg file as "noreplace" to keep current setup