[packages/horde-jonah] - migrated to apache 2.4

[baggins]

commit 018760fafc6388184a3a69291d40777aebbaebdc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 19:49:57 2013 +0200

    - migrated to apache 2.4

 horde-jonah.conf => horde-jonah-apache.conf |  2 --
 horde-jonah-httpd.conf                      | 22 ++++++++++++++++++++++
 horde-jonah.spec                            | 12 +++++++-----
 3 files changed, 29 insertions(+), 7 deletions(-)
---
diff --git a/horde-jonah.spec b/horde-jonah.spec
index e809cd2..383d835 100644
--- a/horde-jonah.spec
+++ b/horde-jonah.spec
@@ -1,7 +1,7 @@
 %define	_hordeapp jonah
 %define	_snap	2008-10-10
 #define	_rc		rc1
-%define	_rel	0.1
+%define	_rel	1
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	Jonah is the Horde portal project
@@ -13,7 +13,8 @@ License:	GPL
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz
 # Source0-md5:	c394efc727440d4b0481cb018d0bb5d3
-Source1:	%{name}.conf
+Source1:	%{name}-apache.conf
+Source2:	%{name}-httpd.conf
 URL:		http://www.horde.org/jonah/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.264
@@ -21,6 +22,7 @@ BuildRequires:	tar >= 1:1.15.1
 Requires:	horde >= 3.0
 Requires:	php(mysql)
 Requires:	webapps
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,7 +72,7 @@ cp -a docs/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
 
 ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,10 +97,10 @@ fi
 %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}
 
 %files
diff --git a/horde-jonah.conf b/horde-jonah-apache.conf
similarity index 98%
rename from horde-jonah.conf
rename to horde-jonah-apache.conf
index 75164d5..519f749 100644
--- a/horde-jonah.conf
+++ b/horde-jonah-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 <Directory "/usr/share/horde/jonah">
     <IfModule mod_rewrite.c>
         RewriteEngine On
diff --git a/horde-jonah-httpd.conf b/horde-jonah-httpd.conf
new file mode 100644
index 0000000..192e260
--- /dev/null
+++ b/horde-jonah-httpd.conf
@@ -0,0 +1,22 @@
+<Directory "/usr/share/horde/jonah">
+    <IfModule mod_rewrite.c>
+        RewriteEngine On
+        RewriteCond   %{REQUEST_FILENAME}  !-d
+        RewriteCond   %{REQUEST_FILENAME}  !-f
+        RewriteRule   ^(.*)$ dispatcher.php/$1 [QSA,L]
+    </IfModule>
+</Directory>
+<Directory "/usr/share/horde/jonah/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/jonah/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/jonah/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/jonah/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde-jonah.git/commitdiff/018760fafc6388184a3a69291d40777aebbaebdc