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

[baggins]

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

    - migrated to apache 2.4

 horde-mottle.spec                 | 12 +++++++-----
 mottle.conf => mottle-apache.conf |  2 --
 mottle-httpd.conf                 | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/horde-mottle.spec b/horde-mottle.spec
index 49a1549..6d1fca5 100644
--- a/horde-mottle.spec
+++ b/horde-mottle.spec
@@ -3,7 +3,7 @@
 %define	_hordeapp mottle
 %define	_snap	2008-10-11
 #define	_rc		rc1
-%define	_rel	1
+%define	_rel	2
 
 %include	/usr/lib/rpm/macros.php
 Summary:	Template for horde projects
@@ -17,7 +17,8 @@ Group:		Applications/WWW
 #Source0:	ftp://ftp.horde.org/pub/skeleton/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
 Source0:	ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz
 # Source0-md5:	d7d9d33a946221ab7c3fb715d409d132
-Source1:	%{_hordeapp}.conf
+Source1:	%{_hordeapp}-apache.conf
+Source2:	%{_hordeapp}-httpd.conf
 URL:		http://cvs.horde.org/mottle/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.264
@@ -25,6 +26,7 @@ BuildRequires:	tar >= 1:1.15.1
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
 Requires:	webapps
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,7 +78,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
@@ -101,10 +103,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/mottle.conf b/mottle-apache.conf
similarity index 97%
rename from mottle.conf
rename to mottle-apache.conf
index e78c3be..c96c5b1 100644
--- a/mottle.conf
+++ b/mottle-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 <Directory "/usr/share/horde/mottle/config">
 	order deny,allow
 	deny from all
diff --git a/mottle-httpd.conf b/mottle-httpd.conf
new file mode 100644
index 0000000..d45cd98
--- /dev/null
+++ b/mottle-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/mottle/config">
+	Require all denied
+</Directory>
+<Directory "/usr/share/horde/mottle/lib">
+	Require all denied
+</Directory>
+<Directory "/usr/share/horde/mottle/locale">
+	Require all denied
+</Directory>
+<Directory "/usr/share/horde/mottle/templates">
+	Require all denied
+</Directory>
+
+# vim: filetype=apache
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde-mottle.git/commitdiff/ea0e07d78aa3cefa0a777c75327d1497b08c3e71