[packages/phpMyAdmin] apache 2.2/2.4 compatible config

[glen]

commit 1bdc8ed07430766b45b4930572ee5ffedf109c6e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Feb 5 01:13:23 2014 +0200

    apache 2.2/2.4 compatible config

 phpMyAdmin.conf => apache.conf | 13 +++++++++++--
 phpMyAdmin.spec                | 14 +++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index f8af80e..012cb6c 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -5,12 +5,12 @@ Summary:	phpMyAdmin - web-based MySQL administration
 Summary(pl.UTF-8):	phpMyAdmin - administracja bazami MySQL przez WWW
 Name:		phpMyAdmin
 Version:	4.1.6
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz
 # Source0-md5:	2f34f35824f7189822ca2a9f1ccc55ce
-Source1:	%{name}-apache.conf
+Source1:	apache.conf
 Source2:	%{name}-lighttpd.conf
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-ServerSelectDisplayName.patch
@@ -93,15 +93,15 @@ podręcznika MySQL). Aktualnie phpMyAdmin potrafi:
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
 
-install *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
+cp -p *.php *.css favicon.ico robots.txt $RPM_BUILD_ROOT%{_appdir}
 cp -a locale themes js libraries $RPM_BUILD_ROOT%{_appdir}
 
-install libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
+cp -p libraries/config.default.php $RPM_BUILD_ROOT%{_sysconfdir}/config.inc.php
 ln -sf %{_sysconfdir}/config.inc.php $RPM_BUILD_ROOT%{_appdir}/config.inc.php
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/phpMyAdmin.conf b/apache.conf
similarity index 61%
rename from phpMyAdmin.conf
rename to apache.conf
index 7ef24e8..1d7dbf3 100644
--- a/phpMyAdmin.conf
+++ b/apache.conf
@@ -2,8 +2,17 @@ Alias /myadmin /usr/share/phpMyAdmin
 <Directory "/usr/share/phpMyAdmin">
 	Options FollowSymLinks
 	AllowOverride None
-	Order allow,deny
-	Allow from all
+
+	# Apache 2.x
+	<IfModule !mod_authz_core.c>
+		Order allow,deny
+		Allow from all
+	</IfModule>
+	# Apache 2.4
+	<IfModule mod_authz_core.c>
+		Require all granted
+	</IfModule>
+
 	# uncomment if using apache-mod_php
 	#php_admin_value open_basedir "/etc/webapps/phpMyAdmin/:/usr/share/phpMyAdmin/:/usr/share/phpMyAdmin/css/..:/tmp"
 </Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phpMyAdmin.git/commitdiff/218e7bb64d4711102e4831277bf2a5d6af95bb55