From 7df3762f9f755ee1608619e777f119394e47eac31de3eec68b0860169e74c9cb Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Wed, 6 Jan 2016 20:29:18 +0000
Subject: [PATCH] Accepting request 352345 from home:computersalat:devel:php

fix for boo#951002

OBS-URL: https://build.opensuse.org/request/show/352345
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpPgAdmin?expand=0&rev=18
---
 phpPgAdmin.changes | 6 ++++++
 phpPgAdmin.http    | 9 +++++++--
 phpPgAdmin.spec    | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/phpPgAdmin.changes b/phpPgAdmin.changes
index 3d5e4b9..c989a0e 100644
--- a/phpPgAdmin.changes
+++ b/phpPgAdmin.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan  6 18:26:46 UTC 2016 - chris@computersalat.de
+
+- fix for boo#951002
+  * make http config compatible with apache 2.4
+
 -------------------------------------------------------------------
 Fri Jan 31 14:43:01 UTC 2014 - rsalevsky@suse.com
 
diff --git a/phpPgAdmin.http b/phpPgAdmin.http
index 862709b..b60a5a5 100644
--- a/phpPgAdmin.http
+++ b/phpPgAdmin.http
@@ -12,7 +12,12 @@
   </IfModule>
 </Directory>
 <Directory @ap_docroot@/@name@/libraries>
-  Order allow,deny
-  Deny from all
+  <IfVersion >= 2.4>
+    Require all denied
+  </IfVersion>
+  <IfVersion < 2.4>
+    Order allow,deny
+    Deny from all
+  </IfVersion>
 </Directory>
 
diff --git a/phpPgAdmin.spec b/phpPgAdmin.spec
index 2192288..3f0228c 100644
--- a/phpPgAdmin.spec
+++ b/phpPgAdmin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package phpPgAdmin
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed