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

[baggins]

commit 2b0c45d7ccc7ca8f5d5f69bfcaa45245917aedcf
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 19:52:43 2013 +0200

    - migrated to apache 2.4

 horde-mimp.spec               | 12 +++++++-----
 mimp.conf => mimp-apache.conf |  2 --
 mimp-httpd.conf               | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/horde-mimp.spec b/horde-mimp.spec
index 1015323..6b77453 100644
--- a/horde-mimp.spec
+++ b/horde-mimp.spec
@@ -5,12 +5,13 @@ Summary:	MIMP - a stripped down version of IMP for use on mobile phones/PDAs
 Summary(pl.UTF-8):	MIMP - uproszczona wersja IMP-a do używania na telefonach przenośnych i PDA
 Name:		horde-%{_hordeapp}
 Version:	1.1.3
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/mimp/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	65fad2a42431304fac260889ba71e13d
-Source1:	%{_hordeapp}.conf
+Source1:	%{_hordeapp}-apache.conf
+Source2:	%{_hordeapp}-httpd.conf
 URL:		http://www.horde.org/mimp/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -18,6 +19,7 @@ Requires:	horde >= 3.2
 Requires:	horde-imp >= 4.2
 Requires:	webapps
 Obsoletes:	mimp
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,7 +73,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
@@ -87,10 +89,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} < 0.1-0.20051116.0.3, %{_hordeapp}
diff --git a/mimp.conf b/mimp-apache.conf
similarity index 98%
rename from mimp.conf
rename to mimp-apache.conf
index 792f359..cf3415c 100644
--- a/mimp.conf
+++ b/mimp-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 <Directory "/usr/share/horde/mimp/config">
     order deny,allow
     deny from all
diff --git a/mimp-httpd.conf b/mimp-httpd.conf
new file mode 100644
index 0000000..b43f826
--- /dev/null
+++ b/mimp-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/mimp/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/mimp/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/mimp/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/mimp/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde-mimp.git/commitdiff/2b0c45d7ccc7ca8f5d5f69bfcaa45245917aedcf