- migrated to apache 2.4

diff --git a/horde-mnemo.spec b/horde-mnemo.spec
index bd8221fe74ea51c5b314eee5c3de8a0a74cdd94c..debbde5d1e18f4ca777cc33bd645d7359d8ccb6b 100644 (file)
--- a/horde-mnemo.spec
+++ b/horde-mnemo.spec
@@ -5,12 +5,13 @@ Summary:      Horde notes and memos application
 Summary(pl.UTF-8):     Aplikacja z notatkami i przypominajkami dla Horde
 Name:          horde-%{hordeapp}
 Version:       2.2.4
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/WWW
 Source0:       ftp://ftp.horde.org/pub/mnemo/%{hordeapp}-h3-%{version}.tar.gz
 # Source0-md5: dd5962bf7131649351d88b42770797cf
-Source1:       %{hordeapp}.conf
+Source1:       %{hordeapp}-apache.conf
+Source2:       %{hordeapp}-httpd.conf
 Patch0:                %{hordeapp}-prefs.patch
 URL:           http://www.horde.org/mnemo/
 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)
 
@@ -72,7 +74,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
@@ -97,10 +99,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/mnemo.conf b/mnemo-apache.conf
similarity index 98%
rename from mnemo.conf
rename to mnemo-apache.conf
index 51871715853acc6ad76d03b8ef24beaa0b720c67..5cd3f7d5416a68708fdb097aa6f44caede11c6d8 100644 (file)
--- a/mnemo.conf
+++ b/mnemo-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 <Directory "/usr/share/horde/mnemo/config">
     order deny,allow
     deny from all

diff --git a/mnemo-httpd.conf b/mnemo-httpd.conf
new file mode 100644 (file)
index 0000000..b52cc36
--- /dev/null
+++ b/mnemo-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/mnemo/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/mnemo/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/mnemo/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/mnemo/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et