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

[baggins]

commit 86d61fe508026fc2e54f2d85c183ee13899dbb28
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 19:41:51 2013 +0200

    - migrated to apache 2.4

 horde-ingo.spec               | 12 +++++++-----
 ingo.conf => ingo-apache.conf |  2 --
 ingo-httpd.conf               | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/horde-ingo.spec b/horde-ingo.spec
index 6906c2f..fd64de9 100644
--- a/horde-ingo.spec
+++ b/horde-ingo.spec
@@ -5,12 +5,13 @@ Summary:	Ingo - an email filter rules manager
 Summary(pl.UTF-8):	Ingo - zarządca reguł filtrowania poczty elektronicznej
 Name:		horde-%{hordeapp}
 Version:	1.2.6
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/ingo/%{hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	d8549db0b8ceeb08dd16e0f99a275e05
-Source1:	%{hordeapp}.conf
+Source1:	%{hordeapp}-apache.conf
+Source2:	%{hordeapp}-httpd.conf
 Patch0:		%{hordeapp}-path.patch
 Patch1:		%{hordeapp}-maildir-prefix.patch
 Patch2:		%{hordeapp}-folders-in-maildir.patch
@@ -23,6 +24,7 @@ Requires:	webapps
 Suggests:	php-pear-Net_Sieve >= 1.0.1
 Suggests:	php-pear-Net_Socket
 Obsoletes:	ingo
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -87,7 +89,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
@@ -103,10 +105,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/ingo.conf b/ingo-apache.conf
similarity index 98%
rename from ingo.conf
rename to ingo-apache.conf
index 18ff016..b85b55b 100644
--- a/ingo.conf
+++ b/ingo-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 <Directory "/usr/share/horde/ingo/config">
     order deny,allow
     deny from all
diff --git a/ingo-httpd.conf b/ingo-httpd.conf
new file mode 100644
index 0000000..a0f404c
--- /dev/null
+++ b/ingo-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/ingo/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/ingo/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/ingo/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/ingo/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde-ingo.git/commitdiff/86d61fe508026fc2e54f2d85c183ee13899dbb28