- migrated to apache 2.4auto/th/horde-vacation-3.2.1-3

3 files changed, 21 insertions, 9 deletions

diff --git a/horde-vacation.conf b/horde-vacation-apache.conf
index 5f5733e..6bc5268 100644
--- a/horde-vacation.conf
+++ b/horde-vacation-apache.conf
@@ -1,6 +1,3 @@
-# $Id$
-
-<IfModule mod_access.c>
 <Directory "/usr/share/horde/vacation/config">
     order deny,allow
     deny from all
@@ -17,6 +14,5 @@
     order deny,allow
     deny from all
 </Directory>
-</IfModule>
 
 # vim: filetype=apache ts=4 sw=4 et
diff --git a/horde-vacation-httpd.conf b/horde-vacation-httpd.conf
new file mode 100644
index 0000000..cc87b4b
--- /dev/null
+++ b/horde-vacation-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/vacation/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/vacation/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/vacation/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/vacation/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
diff --git a/horde-vacation.spec b/horde-vacation.spec
index a5780b7..5081b7d 100644
--- a/horde-vacation.spec
+++ b/horde-vacation.spec
@@ -5,12 +5,13 @@ Summary:	vacation - vacation manager module for Horde
 Summary(pl.UTF-8):	vacation - moduł zarządzania wakacjami dla Horde
 Name:		horde-%{_hordeapp}
 Version:	3.2.1
-Release:	2
+Release:	3
 License:	ASL
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/vacation/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	5769676b2e82ac0b15c3a6ac4405b71d
-Source1:	%{name}.conf
+Source1:	%{name}-apache.conf
+Source2:	%{name}-httpd.conf
 URL:		http://www.horde.org/vacation/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
@@ -22,6 +23,7 @@ Requires:	vacation
 Requires:	webapps
 Suggests:	php(ftp)
 Suggests:	php(ldap)
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -74,7 +76,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
@@ -99,10 +101,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} < 2.2.2-0.2, %{_hordeapp}