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

[baggins]

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

    - migrated to apache 2.4

 horde-passwd.conf => horde-passwd-apache.conf |  0
 horde-passwd-httpd.conf                       | 21 +++++++++++++++++++++
 horde-passwd.spec                             | 12 +++++++-----
 3 files changed, 28 insertions(+), 5 deletions(-)
---
diff --git a/horde-passwd.spec b/horde-passwd.spec
index 0e3848a..874b9fc 100644
--- a/horde-passwd.spec
+++ b/horde-passwd.spec
@@ -5,12 +5,13 @@ Summary:	passwd - password change module for Horde
 Summary(pl.UTF-8):	passwd - moduł do zmieniania haseł w Horde
 Name:		horde-%{_hordeapp}
 Version:	3.1.3
-Release:	2
+Release:	3
 License:	ASL
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/passwd/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	2094be49e14e94ff66e9304718db7cd6
-Source1:	%{name}.conf
+Source1:	%{name}-apache.conf
+Source2:	%{name}-httpd.conf
 URL:		http://www.horde.org/passwd/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.264
@@ -24,6 +25,7 @@ Suggests:	php(ldap)
 Suggests:	php(mhash)
 Suggests:	php-pear-Crypt_CHAP
 Obsoletes:	horde-addons-passwd
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -69,7 +71,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
@@ -94,10 +96,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} < 3.0-2.1
diff --git a/horde-passwd.conf b/horde-passwd-apache.conf
similarity index 100%
rename from horde-passwd.conf
rename to horde-passwd-apache.conf
diff --git a/horde-passwd-httpd.conf b/horde-passwd-httpd.conf
new file mode 100644
index 0000000..5c82f50
--- /dev/null
+++ b/horde-passwd-httpd.conf
@@ -0,0 +1,21 @@
+#
+#  File: horde-passwd.conf
+#
+#  This is the horde-passwd Apache configuration file; it is included from
+#  the Apache httpd.conf file.
+#
+
+<Directory "/usr/share/horde/passwd/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/passwd/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/passwd/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/passwd/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde-passwd.git/commitdiff/f96d87d0a76d03aa68b4acf05ffc7213ca69650f