[packages/jquery] - migrated to apache 2.4

[baggins]

commit d8e980756b5e7b5fb857728d0ca1c8905091a9aa
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 20:15:34 2013 +0200

    - migrated to apache 2.4

 apache.conf |  5 -----
 httpd.conf  |  9 +++++++++
 jquery.spec | 10 ++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/jquery.spec b/jquery.spec
index f9a9b37..7649ebf 100644
--- a/jquery.spec
+++ b/jquery.spec
@@ -8,7 +8,7 @@ Summary:	jQuery JavaScript Library
 Summary(pl.UTF-8):	Biblioteka JavaScriptu jQuery
 Name:		jquery
 Version:	1.8.3
-Release:	1
+Release:	2
 License:	MIT
 Group:		Applications/WWW
 Source0:	http://code.jquery.com/%{name}-%{version}.min.js
@@ -17,6 +17,7 @@ Source10:	http://code.jquery.com/%{name}-%{version}.js
 # Source10-md5:	b25b0460d7ddea993dad32005f56d255
 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
@@ -28,6 +29,7 @@ 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)
@@ -90,7 +92,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 $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
+cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,10 +103,10 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd
diff --git a/apache.conf b/apache.conf
index 0610772..85c687b 100644
--- a/apache.conf
+++ b/apache.conf
@@ -2,13 +2,8 @@ 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
new file mode 100644
index 0000000..e05e89f
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,9 @@
+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/d8e980756b5e7b5fb857728d0ca1c8905091a9aa