- drop systemd leftovers

diff --git a/dovecot.spec b/dovecot.spec
index 34fcec4acfe960fdb08d191a41d2fef8bc9d5381..08380b7304d01acf4813401c1ec00c56c37472ec 100644 (file)
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -19,7 +19,6 @@ Source0:      http://dovecot.org/releases/2.2/%{name}-%{version}.tar.gz
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig

-Source4:       %{name}.tmpfiles

 Patch0:                %{name}-config.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf
 Patch0:                %{name}-config.patch
 URL:           http://dovecot.org/
 BuildRequires: autoconf


@@ -177,8 +176,7 @@ touch config.rpath
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security} \
 %install
 rm -rf $RPM_BUILD_ROOT
 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/usr/lib/tmpfiles.d
+       $RPM_BUILD_ROOT{/var/lib/dovecot,/var/run/dovecot/login}

 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT


@@ -188,7 +186,6 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/example-config/* $RPM_BUILD_ROOT%{_
 cp -a %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/%{name}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 cp -a %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/%{name}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}

-install %{SOURCE4} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf

 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.imap
 
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.imap
 


@@ -324,7 +321,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/plugins/doveadm/*.so
 %dir %{_libdir}/%{name}/plugins/stats
 %attr(755,root,root) %{_libdir}/%{name}/plugins/stats/*.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/doveadm/*.so
 %dir %{_libdir}/%{name}/plugins/stats
 %attr(755,root,root) %{_libdir}/%{name}/plugins/stats/*.so

-/usr/lib/tmpfiles.d/%{name}.conf

 %dir /var/lib/dovecot
 %dir /var/run/dovecot
 %attr(750,root,dovenull) %dir /var/run/dovecot/login
 %dir /var/lib/dovecot
 %dir /var/run/dovecot
 %attr(750,root,dovenull) %dir /var/run/dovecot/login

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