multi apache version package

diff --git a/cvsweb-apache.conf b/cvsweb-apache.conf
index 3c80dd92d42926995926e1a9821770d0cfa39f5d..faa246b5b5b0a06c0d4cac059f3d4240340b56ee 100644 (file)
--- a/cvsweb-apache.conf
+++ b/cvsweb-apache.conf
@@ -1,14 +1,30 @@
 
 <Directory /usr/share/cvsweb>
        AllowOverride None
-       Allow from all
+       # Apache 2.x
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
+       # Apache 2.4
+       <IfModule mod_authz_core.c>
+               Require all granted
+       </IfModule>
 </Directory>
 
 # Version1 (default): under /cgi-bin/cvsweb.cgi address
 ScriptAlias /cgi-bin/cvsweb.cgi /usr/lib/cgi-bin/cvsweb.cgi
 Alias /cvsweb/ /usr/share/cvsweb/
 <Location /cgi-bin/cvsweb.cgi>
-       Allow from all
+       # Apache 2.x
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
+       # Apache 2.4
+       <IfModule mod_authz_core.c>
+               Require all granted
+       </IfModule>
 
        # See also $charset in cvsweb.conf.
        #AddDefaultCharset UTF-8
@@ -30,6 +46,14 @@ Alias /cvsweb/ /usr/share/cvsweb/
 #      DocumentRoot /usr/lib/cgi-bin/cvsweb.cgi
 #      <Location />
 #              Options ExecCGI
-#              Allow from all
+#              # Apache 2.x
+#              <IfModule !mod_authz_core.c>
+#                      Order allow,deny
+#                      Allow from all
+#              </IfModule>
+#              # Apache 2.4
+#              <IfModule mod_authz_core.c>
+#                      Require all granted
+#              </IfModule>
 #      </Location>
 #</VirtualHost>

diff --git a/cvsweb.spec b/cvsweb.spec
index 5c6ee8ce82d993049dac3220f9ffa87c6d066f81..9d55c7ee026a4bc66b2b610ac6bfc4bb315ddbde 100644 (file)
--- a/cvsweb.spec
+++ b/cvsweb.spec
@@ -3,7 +3,7 @@ Summary:        Visual (www) interface to explore a CVS repository
 Summary(pl.UTF-8):     Wizualny (WWW) interfejs do przeglądania repozytorium CVS
 Name:          cvsweb
 Version:       3.0.6
-Release:       6
+Release:       8
 Epoch:         1
 License:       BSD
 Group:         Development/Tools
@@ -23,6 +23,7 @@ Requires:     filesystem >= 3.0-11
 Requires:      mailcap
 Requires:      rcs
 Requires:      webapps
+Requires:      webserver(access)
 Conflicts:     apache-base < 2.2.0-8
 Conflicts:     apache1 < 1.3.34-6
 BuildArch:     noarch