- migrate to apache 2.4

diff --git a/awstats-httpd.conf b/awstats-httpd.conf
index 7b40baff631f8c17badde09611497182325206ff..15919789136ea61a8e9ae6c263b977b3c0d4a942 100644 (file)
--- a/awstats-httpd.conf
+++ b/awstats-httpd.conf
@@ -5,8 +5,7 @@ Alias /js/awstats_misc_tracker.js "/usr/share/awstats/wwwroot/js/awstats_misc_tr
 ScriptAlias /awstats/ "/usr/share/awstats/wwwroot/cgi-bin/"
 
 <Directory "/usr/share/awstats/wwwroot">
-Options None
-AllowOverride None
-Order allow,deny
-Allow from all
+       Options None
+       AllowOverride None
+       Require all granted
 </Directory>

diff --git a/awstats.spec b/awstats.spec
index 953d63f09975776da29da302c34a39f49c79cedd..cda8acc310d72be49f8184fd1d55230cd00f8734 100644 (file)
--- a/awstats.spec
+++ b/awstats.spec
@@ -29,6 +29,7 @@ Requires:     perl-Geo-IP
 Requires:      perl-Storable
 Requires:      perl-Time-HiRes
 Requires:      webapps
+Conflicts:     apache < 2.4.0-1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -94,10 +95,10 @@ ln -s %{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl $RPM_BUILD_ROOT%{_bindir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd