[packages/horde-chora] - migrate to apache 2.4 - rel 2

[baggins]

commit ecbe8a86ea46916cdaf550f3134489d9d40069bc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 19:13:18 2013 +0200

    - migrate to apache 2.4
    - rel 2

 chora.conf => chora-apache.conf |  0
 chora-httpd.conf                | 14 ++++++++++++++
 horde-chora.spec                | 12 +++++++-----
 3 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/horde-chora.spec b/horde-chora.spec
index 3e52222..a6c4a29 100644
--- a/horde-chora.spec
+++ b/horde-chora.spec
@@ -5,12 +5,13 @@ Summary:	Web Based CVS Program
 Summary(pl.UTF-8):	Program do obsługi CVS przez WWW
 Name:		horde-%{_hordeapp}
 Version:	2.1.1
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/chora/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	b77ec9e7c703c34ffbcc46ceaa87e132
-Source1:	%{_hordeapp}.conf
+Source1:	%{_hordeapp}-apache.conf
+Source2:	%{_hordeapp}-httpd.conf
 Patch0:		%{_hordeapp}-prefs.patch
 URL:		http://www.horde.org/chora/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
@@ -23,6 +24,7 @@ Suggests:	cvsps
 Suggests:	rcs
 Suggests:	subversion
 Obsoletes:	chora
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -75,7 +77,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
@@ -91,10 +93,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}
 
 %triggerpostun -- horde-%{_hordeapp} < 2.0.1-1.1, %{_hordeapp}
diff --git a/chora.conf b/chora-apache.conf
similarity index 100%
rename from chora.conf
rename to chora-apache.conf
diff --git a/chora-httpd.conf b/chora-httpd.conf
new file mode 100644
index 0000000..c599e14
--- /dev/null
+++ b/chora-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/chora/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/chora/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/chora/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/chora/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde-chora.git/commitdiff/ecbe8a86ea46916cdaf550f3134489d9d40069bc