Attachment 730262 Details for Bug 947058 – Requires crontabs patch

[patch] Requires crontabs patch

requires-crontabs.patch (text/plain), 3.54 KB, created by Jóhann B. Guðmundsson on 2013-04-01 12:27:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jóhann B. Guðmundsson

Created: 2013-04-01 12:27:01 UTC

Size: 3.54 KB

patch

obsolete

>From a40ec7f451885ade9a1dafd1739c94dc3e5743f8 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?=
> <johannbg@fedoraproject.org>
>Date: Mon, 1 Apr 2013 10:55:50 +0000
>Subject: [PATCH] Adding a missing requirement on crontabs for the cron job to
> the spec file
>
>---
> cacti.cron |  1 +
> cacti.spec | 20 ++++++++++----------
> 2 files changed, 11 insertions(+), 10 deletions(-)
> create mode 100644 cacti.cron
>
>diff --git a/cacti.cron b/cacti.cron
>new file mode 100644
>index 0000000..14b5f76
>--- /dev/null
>+++ b/cacti.cron
>@@ -0,0 +1 @@
>+#*/5 * * * *	cacti	/usr/bin/php /usr/share/cacti/poller.php > /dev/null 2>&1
>diff --git a/cacti.spec b/cacti.spec
>index f8355c7..78c6c6c 100644
>--- a/cacti.spec
>+++ b/cacti.spec
>@@ -1,6 +1,6 @@
> Name: cacti
> Version: 0.8.8a
>-Release: 7%{?dist}
>+Release: 8%{?dist}
> Summary: An rrd based graphing tool
> 
> Group: Applications/System
>@@ -16,6 +16,7 @@ Source3: cacti.README.fedora
> Source4: d.gif
> Source5: d.png
> Source6: throbber.gif
>+Source7: %{name}.cron
> # Add replacement files for treeview
> Patch0: cacti-0.8.8a-legal.patch
> # Thanks to Paul Gevers
>@@ -25,8 +26,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> Requires: php, php-mysql, mysql, httpd, rrdtool, net-snmp, php-snmp
> Requires: net-snmp-utils
>+Requires: crontabs
> Requires(pre): %{_sbindir}/useradd
>-Requires(postun): /sbin/service 
>+Requires(postun): systemd
> BuildArch: noarch
> 
> %description
>@@ -45,8 +47,6 @@ used to creating traffic graphs with MRTG.
> cp %{SOURCE4} %{SOURCE5} %{SOURCE6} include/js/jquery/themes/default/
> rm -rf include/treeview
> 
>-echo "#*/5 * * * *	cacti	%{_bindir}/php %{_datadir}/%{name}/poller.php > /dev/null 2>&1" >cacti.cron
>-
> %install
> rm -rf %{buildroot}
> %{__mkdir} -p %{buildroot}/%{_sysconfdir}/%{name}
>@@ -60,7 +60,7 @@ rm -rf %{buildroot}
> %{__install} -m 0755 scripts/* %{buildroot}/%{_localstatedir}/lib/%{name}/scripts/
> %{__install} -d -m 0755 cli/ %{buildroot}/%{_localstatedir}/lib//%{name}/cli/
> %{__install} -m 0755 cli/* %{buildroot}/%{_localstatedir}/lib/%{name}/cli/
>-%{__install} -D -m 0644 cacti.cron %{buildroot}/%{_sysconfdir}/cron.d/cacti
>+%{__install} -p -D -m 0640 %{SOURCE7} %{buildroot}/%{_sysconfdir}/cron.d/%{name}
> %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/cacti.conf
> %{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/cacti
> 
>@@ -90,12 +90,9 @@ rm -rf %{buildroot}
> %{_sbindir}/useradd -d %{_datadir}/%{name} -r -s /sbin/nologin cacti 2> /dev/null || :
> 
> %post
>-if [ $1 == 1 ]; then
>-	/sbin/service httpd condrestart > /dev/null 2>&1 || :
>-fi
> 
> %postun
>-/sbin/service httpd condrestart > /dev/null 2>&1 || :
>+%systemd_postun_with_restart httpd.service
> 
> %files
> %defattr(-,root,root,-)
>@@ -105,7 +102,7 @@ fi
> %dir %{_localstatedir}/lib/%{name}/cli
> %dir %{_localstatedir}/lib/%{name}/scripts
> %doc docs/ README LICENSE cacti.sql
>-%config(noreplace) %{_sysconfdir}/cron.d/cacti
>+%config(noreplace) %{_sysconfdir}/cron.d/%{name}
> %config(noreplace) %{_sysconfdir}/httpd/conf.d/cacti.conf
> %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
> %attr(0640,cacti,apache) %config(noreplace) %{_sysconfdir}/%{name}/db.php
>@@ -129,6 +126,9 @@ fi
> %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
> 
> %changelog
>+* Mon Apr 1 2013 JÃ³hann B. GuÃ°mundsson <johannbg@fedoraproject.org> 0.8.8a-8
>+- Add a missing requirement on crontabs and other spec file cleanup/fixes
>+
> * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.8a-7
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 947058: 730262