[awstats] add a missing requirement on crontab and fix (#947040) fix cron file permissions
plautrba
plautrba at fedoraproject.org
Tue Apr 2 12:08:53 UTC 2013
commit 94408c4c2ad8d8ddaac8ff993b01ca01a00af122
Author: Petr Lautrbach <plautrba at redhat.com>
Date: Tue Apr 2 13:23:59 2013 +0200
add a missing requirement on crontab and fix (#947040)
fix cron file permissions
awstats.cron | 3 +++
awstats.spec | 15 ++++-----------
2 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/awstats.cron b/awstats.cron
new file mode 100644
index 0000000..c2a44ab
--- /dev/null
+++ b/awstats.cron
@@ -0,0 +1,3 @@
+#!/bin/bash
+exec /usr/share/awstats/tools/awstats_updateall.pl now -configdir="/etc/awstats" -awstatsprog="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl" >/dev/null
+exit 0
diff --git a/awstats.spec b/awstats.spec
index a17fda7..a670e23 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -6,6 +6,7 @@ License: GPLv2
Group: Applications/Internet
URL: http://awstats.sourceforge.net
Source0: http://downloads.sourceforge.net/project/awstats/AWStats/%{version}/awstats-%{version}.tar.gz
+Source1: %{name}.cron
Patch0: use-if-instead-of-switch-statement.patch
Patch1: awstats-awredir.pl-sanitize-parameters.patch
# fixed upstream
@@ -20,6 +21,7 @@ BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: recode
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+Requires: crontabs
Requires(post): perl
Requires(postun): systemd
@@ -66,15 +68,6 @@ recode ISO-8859-1..UTF-8 docs/awstats_changelog.txt
%install
rm -rf $RPM_BUILD_ROOT
-### Create cron job
-cat <<EOF >awstats.cron
-#!/bin/bash
-exec %{_datadir}/awstats/tools/awstats_updateall.pl now \
- -configdir="%{_sysconfdir}/awstats" \
- -awstatsprog="%{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl" >/dev/null
-exit 0
-EOF
-
### Create folders
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{httpd/conf.d,%{name},cron.hourly}
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
@@ -125,7 +118,7 @@ install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%
#</IfModule>" >> $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
# Cron job
-install -m 0755 awstats.cron $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/%{name}
+install -m 0750 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/%{name}
%clean
@@ -152,7 +145,7 @@ fi
%defattr(-,root,root,755)
# Apache configuration file
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%config(noreplace) %attr(755,root,root) %{_sysconfdir}/cron.hourly/%{name}
+%config(noreplace) %attr(750,root,root) %{_sysconfdir}/cron.hourly/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/
%{_localstatedir}/lib/%{name}
%dir %{_datadir}/%{name}
More information about the scm-commits
mailing list