[packages/lxr] - migrated to apache 2.4

baggins baggins at pld-linux.org
Wed May 15 22:34:13 CEST 2013


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

    - migrated to apache 2.4

 lxr-httpd.conf | 4 +---
 lxr.spec       | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/lxr.spec b/lxr.spec
index 170ecbb..a00b658 100644
--- a/lxr.spec
+++ b/lxr.spec
@@ -2,7 +2,7 @@
 Summary:	Linux Cross-Reference
 Name:		lxr
 Version:	0.9.10
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://dl.sourceforge.net/lxr/%{name}-%{version}.tgz
@@ -23,6 +23,7 @@ Requires:	perl-File-MMagic
 Requires:	swish-e >= 2.1
 Requires:	webapps
 Suggests:	perl-Linux-KernelSort
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -87,10 +88,10 @@ EOF
 %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}
 
 %clean
diff --git a/lxr-httpd.conf b/lxr-httpd.conf
index 56b9b53..ffa2cae 100644
--- a/lxr-httpd.conf
+++ b/lxr-httpd.conf
@@ -4,10 +4,8 @@ Alias /lxr/ /usr/share/lxr/
 	DirectoryIndex source
 	Options Indexes ExecCGI FollowSymlinks
 
-	Order deny,allow
-
 	<Files ~ (.*\.conf|.*\.pm|genxref)$>
-		Deny from all
+		Require all denied
 	</Files>
 
 <IfModule mod_perl.c>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxr.git/commitdiff/394c34373ede9a3ce9407698b2f3ce38123a465d



More information about the pld-cvs-commit mailing list