diff --git a/dovecot.changes b/dovecot.changes index 374a3bc..6a260ea 100644 --- a/dovecot.changes +++ b/dovecot.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Dec 24 02:10:16 UTC 2017 - mrueckert@suse.de + +- bump recommends to 2.3 + +------------------------------------------------------------------- +Sun Dec 24 02:07:20 UTC 2017 - mrueckert@suse.de + +- copy example config from /usr/share/dovecot/example-config/ + instead of the documentation directory. (boo#1070871) + ------------------------------------------------------------------- Wed Dec 20 11:24:54 UTC 2017 - mrueckert@suse.de diff --git a/dovecot.spec b/dovecot.spec index 2b41381..b9db3d2 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -30,7 +30,7 @@ License: BSD-3-Clause and LGPL-2.1+ and MIT Group: Productivity/Networking/Email/Servers Url: http://www.dovecot.org/ PreReq: dovecot-implementation -Recommends: dovecot22 +Recommends: dovecot23 #!BuildIgnore: dovecot-implementation %if %{with systemd} BuildRequires: pkgconfig(systemd) @@ -109,10 +109,10 @@ install -D -m 0644 %{S:9} %{buildroot}%{_unitdir}/dovecot.socket # we fail silently if the dovecot-implementation package is not # installed yet. This allows us to break a little build loop between # dovecot and dovecotXY. -if [ ! -e /etc/dovecot/dovecot.conf -a -e /usr/share/doc/packages/dovecot/example-config/dovecot.conf ] ; then +if [ ! -e %{_sysconfdir}/%{name}/dovecot.conf -a -e %{_datadir}/%{name}/example-config/dovecot.conf ] ; then # install default config echo "Did not find a /etc/dovecot/dovecot.conf. copying default configuration" - cp -na %{_docdir}/%{name}/example-config/* %{_sysconfdir}/%{name}/ + cp -na %{_datadir}/%{name}/example-config/* %{_sysconfdir}/%{name}/ # the chmod breaks the lda. lets use the more open permissions #chmod -Rv o= %{_sysconfdir}/%{name}/ fi