- migrate to apache 2.4

- rel 2

diff --git a/apache-mod_jk.conf b/apache-mod_jk.conf
index 6f4c4cdfa05c97b58348e099049b42727d27b595..91c466cb38353d8e1e5e51316b370ffa74c1d423 100644 (file)
--- a/apache-mod_jk.conf
+++ b/apache-mod_jk.conf
@@ -1,4 +1,3 @@
-# $Id$
 LoadModule     jk_module       modules/mod_jk.so
 
 # See conf/httpd-jk.conf for more complete directives
@@ -25,13 +24,13 @@ LoadModule  jk_module       modules/mod_jk.so
 
 ### Don't forget to set ACLs for mod_jk URIs
 #    <Location /examples/>
-#      Allow from all
+#      Require all granted
 #    </Location>
 
 ### Access tomcat manager (tomcat-webapp-manager rpm package)
 #    JkMount /manager/html tomcat
 #    <Location /manager/html>
 #      SSLRequireSSL
-#      Allow from all
+#      Require all granted
 #    </Location>
 </IfModule>

diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index f3684dc7c6b2f600abceb97caab9e552ad70e653..5e658d332d32a791ee19296c3feef2f972110324 100644 (file)
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -6,7 +6,7 @@ Summary:        Apache module that handles communication between Tomcat and Apache
 Summary(pl.UTF-8):     Moduł Apache'a obsługujący komunikację między Tomcatem a Apachem
 Name:          apache-mod_%{mod_name}
 Version:       1.2.37
-Release:       1
+Release:       2
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-%{version}-src.tar.gz
@@ -16,7 +16,7 @@ Source2:      %{name}-workers.properties
 Patch0:                %{name}-apxs.patch
 Patch1:                %{name}-libtool.patch
 URL:           http://tomcat.apache.org/connectors-doc/
-BuildRequires: apache-devel >= 2.2
+BuildRequires: apache-devel >= 2.4
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: jpackage-utils