commit 2a28d2f5b7f8d39563906a2192f42933340ca9a2
Author: Jan Rękorajski <[email protected]>
Date: Wed May 15 19:56:49 2013 +0200
- migrated to apache 2.4
horde-nag.spec | 12 +++++++-----
nag.conf => nag-apache.conf | 2 --
nag-httpd.conf | 14 ++++++++++++++
3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/horde-nag.spec b/horde-nag.spec
index 26c6054..daecaaf 100644
--- a/horde-nag.spec
+++ b/horde-nag.spec
@@ -5,12 +5,13 @@ Summary: Nag Task List Manager
Summary(pl.UTF-8): Nag - zarządca list zadań
Name: horde-%{hordeapp}
Version: 2.3.6
-Release: 1
+Release: 2
License: GPL v2
Group: Applications/WWW
Source0: ftp://ftp.horde.org/pub/nag/%{hordeapp}-h3-%{version}.tar.gz
# Source0-md5: c2fafc11f11e9350ab731ee02f87bc1b
-Source1: %{hordeapp}.conf
+Source1: %{hordeapp}-apache.conf
+Source2: %{hordeapp}-httpd.conf
Patch0: %{hordeapp}-prefs.patch
URL: http://www.horde.org/nag/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
@@ -18,6 +19,7 @@ BuildRequires: rpmbuild(macros) >= 1.268
Requires: horde >= 3.0
Requires: webapps
Obsoletes: %{hordeapp}
+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
@@ -93,10 +95,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/nag.conf b/nag-apache.conf
similarity index 98%
rename from nag.conf
rename to nag-apache.conf
index beb1f45..7cb480d 100644
--- a/nag.conf
+++ b/nag-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
<Directory "/usr/share/horde/nag/config">
order deny,allow
deny from all
diff --git a/nag-httpd.conf b/nag-httpd.conf
new file mode 100644
index 0000000..74df464
--- /dev/null
+++ b/nag-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/nag/config">
+ Require all denied
+</Directory>
+<Directory "/usr/share/horde/nag/lib">
+ Require all denied
+</Directory>
+<Directory "/usr/share/horde/nag/locale">
+ Require all denied
+</Directory>
+<Directory "/usr/share/horde/nag/templates">
+ Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/horde-nag.git/commitdiff/2a28d2f5b7f8d39563906a2192f42933340ca9a2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
