Attachment 730229 Details for Bug 947040 – Requires crontab patch

[patch] Requires crontab patch

requires-crontabs.patch (text/plain), 4.20 KB, created by Jóhann B. Guðmundsson on 2013-04-01 10:08:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jóhann B. Guðmundsson

Created: 2013-04-01 10:08:13 UTC

Size: 4.20 KB

patch

obsolete

>From 4a13431f61e83b076928d18c8ad0551ec6ba3cc0 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:01:31 +0000
>Subject: [PATCH] Adding a missing requirement on crontabs for the cron job to
> the spec file
>
>---
> awstats.cron |  3 +++
> awstats.spec | 46 +++++++++++-----------------------------------
> 2 files changed, 14 insertions(+), 35 deletions(-)
> create mode 100644 awstats.cron
>
>diff --git a/awstats.cron b/awstats.cron
>new file mode 100644
>index 0000000..a35416b
>--- /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..f034348 100644
>--- a/awstats.spec
>+++ b/awstats.spec
>@@ -1,25 +1,21 @@
> Name:       awstats
> Version:    7.1.1
>-Release:    1%{?dist}
>+Release:    2%{?dist}
> Summary:    Advanced Web Statistics
> 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
>-# Patch2:     awstats-perl-5.14.patch
>-# CVE-2012-4547, #871159
>-# fixed upstream
>-# Patch3:     awstats-7.0-cleanxss.patch
>-# fix configuration for httpd 2.4 (#871366)
>-Patch4:     awstats-7.0-httpd-2.4.patch
>+Patch2:     awstats-7.0-httpd-2.4.patch
> 
> 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
> 
>@@ -48,9 +44,7 @@ http://localhost/awstats/awstats.pl
> %prep
> %setup -q
> %patch1 -p 1
>-#%patch2 -p 1
>-#%patch3 -p 1
>-%patch4 -p 1
>+%patch2 -p 1
> 
> # Fix style sheets.
> perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
>@@ -66,17 +60,9 @@ 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%{_sysconfdir}/{httpd/conf.d,%{name}}
>+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly
> mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
> mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
> 
>@@ -116,17 +102,9 @@ perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
> 
> # Apache configuration
> install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
>-# move to awstats-7.0-httpd-2.4.patch
>-#perl -pi -e 's|/usr/local|%{_datadir}|g;s|Allow from all|Allow from 127.0.0.1|g' \
>-#             $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
>-#echo "# Additional Perl modules
>-#<IfModule mod_env.c>
>-#    SetEnv PERL5LIB %{_datadir}/awstats/lib:%{_datadir}/awstats/plugins
>-#</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} -p -D -m 0750 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/%{name}
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
>@@ -143,9 +121,7 @@ if [ $1 -eq 1 ]; then
> fi
> 
> %postun
>-if [ $1 -ne 0 ]; then
>-  /bin/systemctl try-restart httpd.service >/dev/null 2>&1 || :
>-fi
>+%systemd_postun_with_restart httpd.service 
> 
> 
> %files
>@@ -172,8 +148,8 @@ fi
> 
> 
> %changelog
>-* Mon Mar 18 2013 Petr Lautrbach <plautrba@redhat.com> 7.1.1-1
>-- version 7.1.1
>+* Mon Apr 1 2013 JÃ³hann B. GuÃ°mundsson <johannbg@fedoraproject.org> 7.1.1-2
>+- Add a missing requirement on crontabs and other spec file cleanup/fixes
> 
> * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.1-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 947040: 730229