[packages/mercurial] Revert "- migrated to apache 2.4"

[glen]

commit de44d27e0f3dd4c7ade1992d423e7683726af7b0
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Sep 26 23:38:33 2013 +0300

    Revert "- migrated to apache 2.4"
    
    This reverts commit 79b64099aa9c6d1200ad9f1a83a74da41de4c16a.
    
    Conflicts:
    	mercurial.spec

 mercurial-hgweb-apache.config | 22 ----------------------
 mercurial.spec                | 10 ++++------
 2 files changed, 4 insertions(+), 28 deletions(-)
---
diff --git a/mercurial.spec b/mercurial.spec
index e18a8a2..3514604 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -24,8 +24,7 @@ Source0:	http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
 Source1:	gtools.py
 Source2:	%{name}-%{webapp}.config
 # TODO: provide default config
-Source3:	%{name}-%{webapp}-apache.config
-Source4:	%{name}-%{webapp}-httpd.config
+Source3:	%{name}-%{webapp}-httpd.config
 Patch0:		%{name}-doc.patch
 Patch1:		%{name}-clean-environment.patch
 URL:		http://mercurial.selenic.com/
@@ -38,7 +37,6 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
 %{?with_tests:BuildRequires:	unzip}
 %pyrequires_eq	python-modules
-Conflicts:	apache-base < 2.4.0-1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -136,7 +134,7 @@ install -d $RPM_BUILD_ROOT%{webappdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{webappdir}/%{webapp}.config
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/apache.conf
-install %{SOURCE4} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{webappdir}/httpd.conf
 
 install contrib/hgk $RPM_BUILD_ROOT%{_bindir}
 
@@ -157,10 +155,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun hgweb -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{webapp}
 
-%triggerin hgweb -- apache-base
+%triggerin hgweb -- apache < 2.2.0, apache-base
 %webapp_register httpd %{webapp}
 
-%triggerun hgweb -- apache-base
+%triggerun hgweb -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{webapp}
 
 %files
diff --git a/mercurial-hgweb-apache.config b/mercurial-hgweb-apache.config
deleted file mode 100644
index 4eb2e8a..0000000
--- a/mercurial-hgweb-apache.config
+++ /dev/null
@@ -1,22 +0,0 @@
-WSGIScriptAlias / /usr/lib64/mercurial/hgwebdir.cgi
-
-<Directory /usr/lib64/mercurial>
-	AllowOverride All
-	Options ExecCGI
-	Order Deny,Allow
-	SetHandler cgi-script
-#	Deny from All
-	Allow from 192.168.*
-	Allow from All
-</Directory>
-
-DocumentRoot /home/services/hg
-
-<Directory /home/services/hg>
-	Options FollowSymlinks Indexes
-	DirectoryIndex index.html
-
-	AllowOverride All
-	Order deny,allow
-	Allow from all
-</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mercurial.git/commitdiff/246e7e3a17e18eb0a23471ffd9ef043c41b0194a