rpms/mrtg
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge Review and spec cleanup

Browse Source
This commit is contained in:
vcrhonek 2008-12-11 16:29:21 +00:00
parent c29a9e8b82
commit dff5fed879
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mrtg.spec
View File

@ -6,7 +6,7 @@
Summary: Multi Router Traffic Grapher Summary: Multi Router Traffic Grapher
Name: mrtg Name: mrtg
Version: 2.16.2 Version: 2.16.2
Release: 1%{?dist} Release: 2%{?dist}
URL: http://oss.oetiker.ch/mrtg/ URL: http://oss.oetiker.ch/mrtg/
Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz
#Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5.gpg #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 Source6: filter-provides-mrtg.sh
Patch0: mrtg-2.15.0-lib64.patch Patch0: mrtg-2.15.0-lib64.patch
Patch1: mrtg-2.10.5-norpath.patch Patch1: mrtg-2.10.5-norpath.patch
License: GPL+ License: GPLv2+
Group: Applications/Internet Group: Applications/Internet
PreReq: vixie-cron Requires: vixie-cron
Requires(post): /sbin/service Requires(post): /sbin/service
Requires(postun): /sbin/service Requires(postun): /sbin/service
Requires: perl-Socket6 perl-IO-Socket-INET6 Requires: perl-Socket6 perl-IO-Socket-INET6
@ -40,7 +40,7 @@ images which provide a LIVE visual representation of this traffic.
%patch0 -p1 -b .lib64 %patch0 -p1 -b .lib64
%patch1 -p1 %patch1 -p1
for i in doc/mrtg-forum.1 doc/mrtg-squid.1; do for i in doc/mrtg-forum.1 doc/mrtg-squid.1 CHANGES; do
iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
mv "${i}_" "$i" mv "${i}_" "$i"
done done
@ -91,17 +91,11 @@ sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_mandir}/man1/*.1
%postun %postun
/sbin/service crond condrestart 2>&1 > /dev/null || : /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 %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root,-)
%doc contrib CHANGES COPYING COPYRIGHT README THANKS %doc contrib CHANGES COPYING COPYRIGHT README THANKS
%dir %{_sysconfdir}/mrtg %dir %{_sysconfdir}/mrtg
%config(noreplace) %{_sysconfdir}/mrtg/mrtg.cfg %config(noreplace) %{_sysconfdir}/mrtg/mrtg.cfg
@ -118,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_localstatedir}/lock/mrtg %dir %{_localstatedir}/lock/mrtg
%changelog %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 * Fri Jun 27 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.16.2-1
- Update to 2.16.2 - Update to 2.16.2
- Mark /etc/crond.d/mrtg file as "noreplace" to keep current setup - Mark /etc/crond.d/mrtg file as "noreplace" to keep current setup