[packages/jquery] make apache access module optional

glen glen at pld-linux.org
Sat Sep 1 12:06:05 CEST 2012


commit c99da19a56c5adb01cf24f1b798c1a3abe66ecb8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Sep 1 13:05:53 2012 +0300

    make apache access module optional

 apache.conf | 9 ++++++++-
 jquery.spec | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/jquery.spec b/jquery.spec
index fc18ecc..3692c4b 100644
--- a/jquery.spec
+++ b/jquery.spec
@@ -1,5 +1,5 @@
 # TODO
-# - drop the addon plugins, say in 1.8?
+# - drop the addon plugins, say in 2.0?
 
 # jquery plugin version
 %define		field_ver	0.9.2
@@ -8,7 +8,7 @@ Summary:	jQuery JavaScript Library
 Summary(pl.UTF-8):	Biblioteka JavaScriptu jQuery
 Name:		jquery
 Version:	1.7.2
-Release:	1
+Release:	2
 License:	MIT / GPL
 Group:		Applications/WWW
 Source0:	http://code.jquery.com/%{name}-%{version}.min.js
@@ -26,8 +26,8 @@ Source4:	http://www.mikage.to/jquery/%{name}.history.js
 URL:		http://www.jquery.com/
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	unzip
-Requires:	webserver(access)
 Requires:	webserver(alias)
+Suggests:	webserver(access)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
diff --git a/apache.conf b/apache.conf
index f132f48..7a0f27b 100644
--- a/apache.conf
+++ b/apache.conf
@@ -2,6 +2,13 @@ Alias /js/jquery/ /usr/share/jquery/
 # legacy
 Alias /jquery/ /usr/share/jquery/
 <Directory /usr/share/jquery>
-	Allow from all
+	# Apache 1.3 / 2.0
+	<IfModule mod_access.c>
+		Allow from all
+	</IfModule>
+	# Apache 2.2+
+	<IfModule mod_authz_host>
+		Allow from all
+	</IfModule>
 	Options +FollowSymLinks
 </Directory>
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list