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

[baggins]

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

    - migrated to apache 2.4

 horde-sam.spec              | 12 +++++++-----
 sam.conf => sam-apache.conf |  0
 sam-httpd.conf              | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/horde-sam.spec b/horde-sam.spec
index aecf755..51c40da 100644
--- a/horde-sam.spec
+++ b/horde-sam.spec
@@ -1,7 +1,7 @@
 %define	_hordeapp sam
 %define	_snap	2007-03-15
 #define	_rc		rc1
-%define	_rel	2
+%define	_rel	3
 
 %include	/usr/lib/rpm/macros.php
 Summary:	Sam - module permitting each user to manage his SpamAssassin or Amavisd-new preferences
@@ -13,7 +13,8 @@ License:	GPL v2
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz
 # Source0-md5:	ada76168961e20855f797e898caf88fe
-Source1:	%{_hordeapp}.conf
+Source1:	%{_hordeapp}-apache.conf
+Source2:	%{_hordeapp}-httpd.conf
 URL:		http://www.horde.org/sam/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.264
@@ -21,6 +22,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)
 
@@ -70,7 +72,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
@@ -96,10 +98,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/sam.conf b/sam-apache.conf
similarity index 100%
rename from sam.conf
rename to sam-apache.conf
diff --git a/sam-httpd.conf b/sam-httpd.conf
new file mode 100644
index 0000000..a5a030a
--- /dev/null
+++ b/sam-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/sam/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/sam/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/sam/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/sam/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde-sam.git/commitdiff/407fb32612df1e2e63f436176340bfb2bf8cb2ad