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

[baggins]

commit 993fcdab37376eda7cddecb1ceef827b6e777b40
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 19:32:33 2013 +0200

    - migrate to apache 2.4
    - rel 2

 hermes.conf => hermes-apache.conf |  2 --
 hermes-httpd.conf                 | 14 ++++++++++++++
 horde-hermes.spec                 | 12 +++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/horde-hermes.spec b/horde-hermes.spec
index 2231bad..5a1cdd0 100644
--- a/horde-hermes.spec
+++ b/horde-hermes.spec
@@ -6,12 +6,13 @@
 Summary:	A time-tracking application
 Name:		horde-%{_hordeapp}
 Version:	1.0.1
-Release:	1
+Release:	2
 License:	ASL
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/hermes/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	41c0297304b145adcfc4cb59f06194d2
-Source1:	%{_hordeapp}.conf
+Source1:	%{_hordeapp}-apache.conf
+Source2:	%{_hordeapp}-httpd.conf
 URL:		http://www.horde.org/hermes/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.264
@@ -22,6 +23,7 @@ Requires:	horde-nag
 Requires:	horde-turba
 Requires:	horde-whups
 Requires:	webapps
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,7 +62,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
@@ -85,10 +87,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/hermes.conf b/hermes-apache.conf
similarity index 98%
rename from hermes.conf
rename to hermes-apache.conf
index 3d30ce9..baab9b4 100644
--- a/hermes.conf
+++ b/hermes-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 <Directory "/usr/share/horde/hermes/config">
     order deny,allow
     deny from all
diff --git a/hermes-httpd.conf b/hermes-httpd.conf
new file mode 100644
index 0000000..778d596
--- /dev/null
+++ b/hermes-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/hermes/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/hermes/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/hermes/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/hermes/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde-hermes.git/commitdiff/993fcdab37376eda7cddecb1ceef827b6e777b40