packages: dovecot/dovecot.spec, dovecot/dovecot-am.patch (NEW) - rel 3 - fi...

[baggins]

Author: baggins                      Date: Tue Jan 31 13:39:27 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- fix for automake 1.11.2

---- Files affected:
packages/dovecot:
   dovecot.spec (1.188 -> 1.189) , dovecot-am.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dovecot/dovecot.spec
diff -u packages/dovecot/dovecot.spec:1.188 packages/dovecot/dovecot.spec:1.189
--- packages/dovecot/dovecot.spec:1.188	Tue Jan 31 12:51:06 2012
+++ packages/dovecot/dovecot.spec	Tue Jan 31 14:39:22 2012
@@ -12,7 +12,7 @@
 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
@@ -23,6 +23,7 @@
 Source3:	%{name}.sysconfig
 Source4:	%{name}.tmpfiles
 Patch0:		%{name}-config.patch
+Patch1:		%{name}-am.patch
 URL:		http://dovecot.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -145,6 +146,7 @@
 %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
 
@@ -171,7 +173,8 @@
 	--with-ssl=openssl \
 	--with-moduledir=%{_libdir}/%{name}/plugins \
 	--with-ssldir=/var/lib/openssl \
-	--sysconfdir=%{_sysconfdir}
+	--sysconfdir=%{_sysconfdir} \
+	--with-systemdsystemunitdir=/lib/systemd/system
 
 %{__make}
 
@@ -356,6 +359,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.189  2012/01/31 13:39:22  baggins
+- rel 3
+- fix for automake 1.11.2
+
 Revision 1.188  2012/01/31 11:51:06  baggins
 - release 2
 

================================================================
Index: packages/dovecot/dovecot-am.patch
diff -u /dev/null packages/dovecot/dovecot-am.patch:1.1
--- /dev/null	Tue Jan 31 14:39:27 2012
+++ packages/dovecot/dovecot-am.patch	Tue Jan 31 14:39:22 2012
@@ -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 \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dovecot/dovecot.spec?r1=1.188&r2=1.189&f=u