- rel 3

- fix for automake 1.11.2

Changed files:
    dovecot-am.patch -> 1.1
    dovecot.spec -> 1.189

diff --git a/dovecot-am.patch b/dovecot-am.patch
new file mode 100644 (file)
index 0000000..f420ae4
--- /dev/null
+++ b/dovecot-am.patch
@@ -0,0 +1,21 @@
+--- dovecot-2.0.16/Makefile.am~        2012-01-31 14:21:23.717655182 +0100
++++ dovecot-2.0.16/Makefile.am 2012-01-31 14:24:01.384328961 +0100
+@@ -21,7 +21,8 @@
+       dovecot-config
+ 
+ nodist_pkginclude_HEADERS = config.h
+-pkglib_DATA = $(datafiles)
++pkgdatadir = $(pkglibdir)
++pkgdata_DATA = $(datafiles)
+ 
+ if MAINTAINER_MODE
+ ChangeLog: .hg/dirstate
+@@ -61,7 +61,7 @@
+ EXTRA_DIST += dovecot.socket dovecot.service.in
+ endif
+ 
+-install-exec-hook:
++install-data-hook:
+       rm $(DESTDIR)$(pkglibdir)/dovecot-config && \
+       grep -v '^LIBDOVECOT_.*_INCLUDE' dovecot-config | \
+       grep -v '^LIBDOVECOT.*_DEPS' | sed \

diff --git a/dovecot.spec b/dovecot.spec
index eccac6041b3e92293f000cf991afa453f5a40a22..1aabbe0847158ded4199c09b50114d16b4975c3c 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -11,7 +11,7 @@ Summary:      IMAP and POP3 server written with security primarily in mind
 Summary(pl.UTF-8):     Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie
 Name:          dovecot
 Version:       2.0.16
-Release:       2
+Release:       3
 Epoch:         1
 License:       MIT (libraries), LGPL v2.1 (the rest)
 Group:         Networking/Daemons
@@ -22,6 +22,7 @@ Source2:      %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}.tmpfiles
 Patch0:                %{name}-config.patch
+Patch1:                %{name}-am.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -144,6 +145,7 @@ Współdzielone biblioteki Dovecota.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
 
@@ -170,7 +172,8 @@ touch config.rpath
        --with-ssl=openssl \
        --with-moduledir=%{_libdir}/%{name}/plugins \
        --with-ssldir=/var/lib/openssl \
-       --sysconfdir=%{_sysconfdir}
+       --sysconfdir=%{_sysconfdir} \
+       --with-systemdsystemunitdir=/lib/systemd/system
 
 %{__make}