- make it build with current th

diff --git a/dovecot-build.patch b/dovecot-build.patch
new file mode 100644 (file)
index 0000000..9ce0edb
--- /dev/null
+++ b/dovecot-build.patch
@@ -0,0 +1,12 @@
+--- dovecot-1.2.17/Makefile.am~        2008-12-14 03:57:16.000000000 +0100
++++ dovecot-1.2.17/Makefile.am 2013-11-27 09:03:43.356086085 +0100
+@@ -20,7 +20,8 @@
+ 
+ if INSTALL_HEADERS
+   nodist_pkginclude_HEADERS = config.h
+-  pkglib_DATA = $(datafiles)
++  datafilesdir = $(pkglibdir)
++  datafiles_DATA = $(datafiles)
+ else
+   noinst_DATA = $(datafiles)
+ endif

diff --git a/dovecot.spec b/dovecot.spec
index 0399ad8693620602b3fc60ad5e6bd1613b26d37d..7208ac2769b983eb91e2ac07d61cd79ebb910d88 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -20,7 +20,9 @@ Source0:      http://dovecot.org/releases/1.2/%{name}-%{version}.tar.gz
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
+Source4:       %{name}.tmpfiles
 Patch0:                %{name}-config.patch
+Patch1:                %{name}-build.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -129,6 +131,7 @@ Pakiet programistyczny do tworzenia wtyczek dla dovecota.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' dovecot-example.conf
 
@@ -159,8 +162,9 @@ touch config.rpath
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security}
-install -d $RPM_BUILD_ROOT{/var/lib/dovecot,/var/run/dovecot/login}
+install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security} \
+       $RPM_BUILD_ROOT{/var/lib/dovecot,/var/run/dovecot/login} \
+       $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 
 %{__make} install \
        moduledir=%{_libdir}/%{name}/plugins \
@@ -171,6 +175,7 @@ mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{dovecot-example.conf,dovecot.conf}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install %{SOURCE4} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.imap
 
@@ -270,6 +275,7 @@ echo "Configuration change default_mail_env -> mail_location"
 %attr(755,root,root) %{_libdir}/%{name}/plugins/lda/*.so
 %dir %{_libdir}/%{name}/plugins/pop3
 %attr(755,root,root) %{_libdir}/%{name}/plugins/pop3/*.so
+%{systemdtmpfilesdir}/%{name}.conf
 %dir /var/lib/dovecot
 %dir /var/run/dovecot
 %attr(750,root,dovecot) %dir /var/run/dovecot/login

diff --git a/dovecot.tmpfiles b/dovecot.tmpfiles
new file mode 100644 (file)
index 0000000..61d4bdf
--- /dev/null
+++ b/dovecot.tmpfiles
@@ -0,0 +1,2 @@
+d /var/run/dovecot 0755 root root -
+d /var/run/dovecot/login 0750 root dovenull -