[awstats] spec file and patches cleanup

[plautrba]

commit 741b525709038e43c2618913911ab992f78bdf5a
Author: Petr Lautrbach <plautrba at redhat.com>
Date:   Tue Apr 2 13:41:43 2013 +0200

    spec file and patches cleanup

 awstats-7.0-cleanxss.patch               |   43 ----------------------
 awstats-perl-5.14.patch                  |   24 ------------
 awstats.spec                             |   25 ++-----------
 use-if-instead-of-switch-statement.patch |   58 ------------------------------
 4 files changed, 4 insertions(+), 146 deletions(-)
---
diff --git a/awstats.spec b/awstats.spec
index a670e23..a1f2de0 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -7,15 +7,9 @@ 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
+Patch0:     awstats-awredir.pl-sanitize-parameters.patch
 # fix configuration for httpd 2.4 (#871366)
-Patch4:     awstats-7.0-httpd-2.4.patch
+Patch1:     awstats-7.0-httpd-2.4.patch
 
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,10 +43,8 @@ http://localhost/awstats/awstats.pl
 
 %prep
 %setup -q
+%patch0 -p 1
 %patch1 -p 1
-#%patch2 -p 1
-#%patch3 -p 1
-%patch4 -p 1
 
 # Fix style sheets.
 perl -pi -e 's,/icon,/awstatsicons,g' wwwroot/css/*
@@ -109,13 +101,6 @@ 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 0750 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/%{name}
@@ -136,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