From 645ea49799b49f74e34d7b92291fd9d4cab439ad88c4a2fd7ba0c9fdabf022a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 17 Apr 2015 16:29:46 +0000
Subject: [PATCH] - Install fitting eximstats.conf depending on SUSE version;
 (bsc#926861). - Add attribute dir to /etc/apache2 and /etc/apache2/conf.d in
 the file list.

OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=164
---
 exim.changes       |  6 ++++++
 exim.spec          | 15 ++++++++++-----
 eximstats.conf     |  4 ++--
 eximstats.conf-2.2 |  6 ++++++
 4 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 eximstats.conf-2.2

diff --git a/exim.changes b/exim.changes
index fc4c83c..315c158 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 17 15:53:24 UTC 2015 - lmuelle@suse.com
+
+- Install fitting eximstats.conf depending on SUSE version; (bsc#926861).
+- Add attribute dir to /etc/apache2 and /etc/apache2/conf.d in the file list.
+
 -------------------------------------------------------------------
 Fri Mar 13 12:26:23 UTC 2015 - lmuelle@suse.com
 
diff --git a/exim.spec b/exim.spec
index 818dff4..45215b4 100644
--- a/exim.spec
+++ b/exim.spec
@@ -77,7 +77,8 @@ Source13:       apparmor.usr.sbin.exim
 Source20:       http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/exim4-manpages.tar.bz2
 Source30:       eximstats-html-update.py
 Source31:       eximstats.conf
-Source32:       exim.service
+Source32:       eximstats.conf-2.2
+Source40:       exim.service
 Patch:          exim-tail.patch
 Patch1:         exim-enable_ecdh_openssl.patch
 
@@ -273,7 +274,7 @@ make 	inst_dest=$RPM_BUILD_ROOT/usr/sbin \
 mv $RPM_BUILD_ROOT/usr/sbin/exim-%{version}* $RPM_BUILD_ROOT/usr/sbin/exim
 mv $RPM_BUILD_ROOT/etc/exim/exim.conf src/configure.default # with all substitutions done
 %if 0%{?suse_version} > 1220
-install -m 0644 %{S:32} $RPM_BUILD_ROOT/%{_unitdir}/exim.service
+install -m 0644 %{S:40} $RPM_BUILD_ROOT/%{_unitdir}/exim.service
 %else
 install -m 0755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/exim
 %endif
@@ -326,7 +327,11 @@ chmod 644 util/*.{pl,sh} src/convert4r*
 # eximstats-html files
 mkdir -p $RPM_BUILD_ROOT/srv/www/eximstats
 mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d/
-cp -p $RPM_SOURCE_DIR/eximstats.conf $RPM_BUILD_ROOT/etc/apache2/conf.d/
+%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1310
+	cp -p %{S:31} $RPM_BUILD_ROOT/etc/apache2/conf.d/
+%else
+	cp -p %{S:32} $RPM_BUILD_ROOT/etc/apache2/conf.d/eximstats.conf
+%endif
 install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbindir}
 # apparmor profile
 install -D -m 0644 $RPM_SOURCE_DIR/apparmor.usr.sbin.exim $RPM_BUILD_ROOT/etc/apparmor/profiles/extras/usr.sbin.exim
@@ -435,8 +440,8 @@ exit 0
 %files -n eximstats-html
 %defattr(-,root,root)
 %attr(0750,root,www) /srv/www/eximstats
-/etc/apache2
-/etc/apache2/conf.d
+%dir /etc/apache2
+%dir /etc/apache2/conf.d
 /etc/apache2/conf.d/eximstats.conf
 %{_sbindir}/eximstats-html-update.py
 
diff --git a/eximstats.conf b/eximstats.conf
index 667627a..06a6e24 100644
--- a/eximstats.conf
+++ b/eximstats.conf
@@ -1,6 +1,6 @@
 Alias /eximstats /srv/www/eximstats
 <Directory /srv/www/eximstats>
-    Order allow,deny
-    Allow from all
+    Require all granted
     Options +Indexes
+    AllowOverride None
 </Directory>
diff --git a/eximstats.conf-2.2 b/eximstats.conf-2.2
new file mode 100644
index 0000000..667627a
--- /dev/null
+++ b/eximstats.conf-2.2
@@ -0,0 +1,6 @@
+Alias /eximstats /srv/www/eximstats
+<Directory /srv/www/eximstats>
+    Order allow,deny
+    Allow from all
+    Options +Indexes
+</Directory>