Revert "- migrate to apache 2.4"

This reverts commit 8bb520fecb2a7a2ac1d96e05eb309d6ac587c543.

Conflicts:
	git-core.spec

diff --git a/git-core-gitweb-apache.conf b/git-core-gitweb-apache.conf
deleted file mode 100644 (file)
index b779287..0000000
--- a/git-core-gitweb-apache.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-<Directory /usr/share/gitweb>
-       AllowOverride None
-       Allow from All
-</Directory>
-
-# Version 1 (default): under /cgi-bin/gitweb.cgi address
-Alias /cgi-bin/static/ /usr/share/gitweb/static/
-ScriptAlias /cgi-bin/gitweb.cgi /usr/lib/cgi-bin/gitweb.cgi
-<Location /cgi-bin/gitweb.cgi>
-       Allow from All
-</Location>
-SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
-
-#
-# Version 2: gitweb as a handler to whole vhost:
-#<VirtualHost *:80>
-#      ServerName gitweb
-#
-#      Alias /static /usr/share/gitweb/static
-#      DocumentRoot /usr/lib/cgi-bin
-#      AddHandler cgi-script .cgi
-#      DirectoryIndex gitweb.cgi
-#      <Location />
-#              Options ExecCGI
-#              Allow from All
-#      </Location>
-#      SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
-#</VirtualHost>

diff --git a/git-core-gitweb-httpd.conf b/git-core-gitweb-httpd.conf
index e03387902f6034bc01d812859fb165c8a30601ba..b77928782c4c6e9c1499d3b2aee32ba4f62b3712 100644 (file)
--- a/git-core-gitweb-httpd.conf
+++ b/git-core-gitweb-httpd.conf
@@ -1,13 +1,13 @@
 <Directory /usr/share/gitweb>
        AllowOverride None
-       Require all granted
+       Allow from All
 </Directory>
 
 # Version 1 (default): under /cgi-bin/gitweb.cgi address
 Alias /cgi-bin/static/ /usr/share/gitweb/static/
 ScriptAlias /cgi-bin/gitweb.cgi /usr/lib/cgi-bin/gitweb.cgi
 <Location /cgi-bin/gitweb.cgi>
-       Require all granted
+       Allow from All
 </Location>
 SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
 
@@ -22,7 +22,7 @@ SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
 #      DirectoryIndex gitweb.cgi
 #      <Location />
 #              Options ExecCGI
-#              Require all granted
+#              Allow from All
 #      </Location>
 #      SetEnv GITWEB_CONFIG "/etc/webapps/gitweb/gitweb.conf"
 #</VirtualHost>

diff --git a/git-core.spec b/git-core.spec
index 9e32b1d218864e1ca7f6009b95e49b355dfb45f9..34a3f7799658ae5b22548a0fbd1afaab7391d98d 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -17,12 +17,11 @@ Group:              Development/Tools
 Source0:       http://git-core.googlecode.com/files/git-%{version}.tar.gz
 # Source0-md5: 355768a1c70d0cb4fedf4b598ac1375b
 Source1:       %{name}-gitweb.conf
-Source2:       %{name}-gitweb-apache.conf
+Source2:       %{name}-gitweb-httpd.conf
 Source3:       %{name}-gitweb-lighttpd.conf
 Source4:       %{name}.sysconfig
 Source5:       %{name}.inet
 Source6:       %{name}.init
-Source7:       %{name}-gitweb-httpd.conf
 Patch0:                %{name}-tests.patch
 Patch1:                %{name}-key-bindings.patch
 Patch2:                %{name}-sysconfdir.patch
@@ -215,7 +214,6 @@ Requires:   webapps
 Requires:      webserver(alias)
 Requires:      webserver(cgi)
 Suggests:      webserver(setenv)
-Conflicts:     apache-base < 2.4.0-1
 
 %description gitweb
 This package provides a web interface for browsing git repositories.
@@ -481,7 +479,7 @@ mv $RPM_BUILD_ROOT{%{appdir},%{cgibindir}}/gitweb.cgi
 ln -s %{cgibindir}/gitweb.cgi $RPM_BUILD_ROOT%{appdir}/gitweb.cgi
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{webappdir}/gitweb.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/apache.conf
-cp -p %{SOURCE7} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/lighttpd.conf
 
 # gitview
@@ -537,10 +535,10 @@ fi
 %triggerun gitweb -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{webapp}
 
-%triggerin gitweb -- apache-base
+%triggerin gitweb -- apache < 2.2.0, apache-base
 %webapp_register httpd %{webapp}
 
-%triggerun gitweb -- apache-base
+%triggerun gitweb -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{webapp}
 
 %triggerin gitweb -- lighttpd