[packages/horde-dimp] - migrate to apache 2.4 - rel 2
baggins
baggins at pld-linux.org
Wed May 15 19:15:09 CEST 2013
commit 8d2a76a5e6e71864ed7f1085bb606b8648a9553f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed May 15 19:14:58 2013 +0200
- migrate to apache 2.4
- rel 2
dimp.conf => dimp-apache.conf | 2 --
dimp-httpd.conf | 14 ++++++++++++++
horde-dimp.spec | 12 +++++++-----
3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/horde-dimp.spec b/horde-dimp.spec
index 75015f6..9e0900a 100644
--- a/horde-dimp.spec
+++ b/horde-dimp.spec
@@ -5,12 +5,13 @@ Summary: Dynamic Internet Messaging Program (DIMP)
Summary(pl.UTF-8): Program do dynamicznej komunikacji przez Internet (DIMP)
Name: horde-%{hordeapp}
Version: 1.1.5
-Release: 1
+Release: 2
License: GPL v2
Group: Applications/WWW
Source0: ftp://ftp.horde.org/pub/dimp/%{hordeapp}-h3-%{version}.tar.gz
# Source0-md5: 6d7605cd927eabf42de3cdb582237d6e
-Source1: %{hordeapp}.conf
+Source1: %{hordeapp}-apache.conf
+Source2: %{hordeapp}-httpd.conf
URL: http://www.horde.org/dimp/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.264
@@ -18,6 +19,7 @@ Requires: apache(mod_access)
Requires: horde >= 3.2
Requires: horde-imp >= 4.2
Requires: webapps
+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
@@ -90,10 +92,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/dimp.conf b/dimp-apache.conf
similarity index 98%
rename from dimp.conf
rename to dimp-apache.conf
index 4dd211b..64845e2 100644
--- a/dimp.conf
+++ b/dimp-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
<Directory "/usr/share/horde/dimp/config">
order deny,allow
deny from all
diff --git a/dimp-httpd.conf b/dimp-httpd.conf
new file mode 100644
index 0000000..5a26b69
--- /dev/null
+++ b/dimp-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/dimp/config">
+ Require all denied
+</Directory>
+<Directory "/usr/share/horde/dimp/lib">
+ Require all denied
+</Directory>
+<Directory "/usr/share/horde/dimp/locale">
+ Require all denied
+</Directory>
+<Directory "/usr/share/horde/dimp/templates">
+ Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/horde-dimp.git/commitdiff/8d2a76a5e6e71864ed7f1085bb606b8648a9553f
More information about the pld-cvs-commit
mailing list