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

[baggins]

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

    - migrated to apache 2.4

 horde-whups.spec                | 12 +++++++-----
 whups.conf => whups-apache.conf |  2 --
 whups-httpd.conf                | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/horde-whups.spec b/horde-whups.spec
index a681ce4..6c71b63 100644
--- a/horde-whups.spec
+++ b/horde-whups.spec
@@ -5,18 +5,20 @@ Summary:	The Web Horde User Problem Solver
 Summary(pl.UTF-8):	Narzędzie WWW do rozwiązywania problemów dla Horde
 Name:		horde-%{_hordeapp}
 Version:	1.0.1
-Release:	1
+Release:	2
 License:	BSD
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/whups/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	3becdec5bcf99292d68780cc741e44ad
-Source1:	%{_hordeapp}.conf
+Source1:	%{_hordeapp}-apache.conf
+Source2:	%{_hordeapp}-httpd.conf
 URL:		http://www.horde.org/whups/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	horde >= 3.2
 Requires:	webapps
 Obsoletes:	whups
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -68,7 +70,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
@@ -95,10 +97,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} < 1.0-0.20050917.0.3, %{_hordeapp}
diff --git a/whups.conf b/whups-apache.conf
similarity index 98%
rename from whups.conf
rename to whups-apache.conf
index 7321925..9c4b1ec 100644
--- a/whups.conf
+++ b/whups-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 <Directory "/usr/share/horde/whups/config">
     order deny,allow
     deny from all
diff --git a/whups-httpd.conf b/whups-httpd.conf
new file mode 100644
index 0000000..f7e47d2
--- /dev/null
+++ b/whups-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/whups/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/whups/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/whups/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/whups/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde-whups.git/commitdiff/c47166234b4a504decdcf61a8fa5a881973917c5