commit exim for openSUSE:Factory
Hello community,
here is the log from the commit of package exim for openSUSE:Factory checked in at 2015-04-23 08:04:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/exim (Old)
and /work/SRC/openSUSE:Factory/.exim.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "exim"
Changes:
--------
--- /work/SRC/openSUSE:Factory/exim/exim.changes 2015-03-23 12:17:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.exim.new/exim.changes 2015-04-23 08:04:31.000000000 +0200
@@ -1,0 +2,6 @@
+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.
+
+-------------------------------------------------------------------
New:
----
eximstats.conf-2.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ exim.spec ++++++
--- /var/tmp/diff_new_pack.IJlR2q/_old 2015-04-23 08:04:32.000000000 +0200
+++ /var/tmp/diff_new_pack.IJlR2q/_new 2015-04-23 08:04:32.000000000 +0200
@@ -77,7 +77,8 @@
Source20: http://www.logic.univie.ac.at/~ametzler/debian/exim4manpages/exim4-manpages....
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 @@
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 @@
# 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 @@
%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
++++++ eximstats.conf ++++++
--- /var/tmp/diff_new_pack.IJlR2q/_old 2015-04-23 08:04:32.000000000 +0200
+++ /var/tmp/diff_new_pack.IJlR2q/_new 2015-04-23 08:04:32.000000000 +0200
@@ -1,6 +1,6 @@
Alias /eximstats /srv/www/eximstats
participants (1)
-
root@hilbert.suse.de