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

[glen]

commit d7f88b61b0bb66c0e2530b4e91324e6e9b0a9582
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Aug 27 17:03:50 2013 +0300

    Revert "- migrated to apache 2.4"
    
    This reverts commit d8e980756b5e7b5fb857728d0ca1c8905091a9aa.
    
    Conflicts:
    	jquery.spec

 apache.conf | 5 +++++
 httpd.conf  | 9 ---------
 jquery.spec | 8 +++-----
 3 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/jquery.spec b/jquery.spec
index c2e039d..98fe21c 100644
--- a/jquery.spec
+++ b/jquery.spec
@@ -17,7 +17,6 @@ Source10:	http://code.jquery.com/%{name}-%{version}.js
 # Source10-md5:	08c235d357750c657ac1db7d1cf656a9
 Source11:	apache.conf
 Source12:	lighttpd.conf
-Source13:	httpd.conf
 Source1:	http://plugins.jquery.com/files/%{name}.field.%{field_ver}.zip
 # Source1-md5:	1bd5d766f79034904a07ddbbab5cb27a
 Source3:	http://marcgrabanski.com/code/ui-datepicker/core/core.ui.datepicker.zip
@@ -29,7 +28,6 @@ BuildRequires:	rpmbuild(macros) >= 1.553
 BuildRequires:	unzip
 Requires:	webserver(alias)
 Suggests:	webserver(access)
-Conflicts:	apache-base < 2.4.0-1
 Conflicts:	jquery-ui < 1.8.22
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,7 +90,7 @@ cp -p ui.datepicker.{js,css} $RPM_BUILD_ROOT%{_appdir}/plugins
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,10 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache-base
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache-base
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd
diff --git a/apache.conf b/apache.conf
index 85c687b..0610772 100644
--- a/apache.conf
+++ b/apache.conf
@@ -2,8 +2,13 @@ Alias /js/jquery/ /usr/share/jquery/
 # legacy
 Alias /jquery/ /usr/share/jquery/
 <Directory /usr/share/jquery>
+	# Apache 1.3 / 2.0
 	<IfModule mod_access.c>
 		Allow from all
 	</IfModule>
+	# Apache 2.2+
+	<IfModule mod_authz_host.c>
+		Allow from all
+	</IfModule>
 	Options +FollowSymLinks
 </Directory>
diff --git a/httpd.conf b/httpd.conf
deleted file mode 100644
index e05e89f..0000000
--- a/httpd.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Alias /js/jquery/ /usr/share/jquery/
-# legacy
-Alias /jquery/ /usr/share/jquery/
-<Directory /usr/share/jquery>
-	<IfModule mod_authz_host.c>
-		Require all granted
-	</IfModule>
-	Options +FollowSymLinks
-</Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jquery.git/commitdiff/8b602812b9fb077c2c6ea00908953c01fd85430b