- fixed excludes

- enable --short-circuit build options by adding -f to rm

diff --git a/postfix.spec b/postfix.spec
index 8191a62361ab0abc18793601f3e58f4fec3fe131..fc3f4ba78b99e701169cd78a04e4bcb8bff5453f 100644 (file)
--- a/postfix.spec
+++ b/postfix.spec
@@ -282,7 +282,7 @@ install -d $RPM_BUILD_ROOT/etc/{cron.daily,rc.d/init.d,sysconfig,pam.d,security,
        $RPM_BUILD_ROOT%{_var}/spool/postfix/{active,corrupt,deferred,maildrop,private,saved,bounce,defer,incoming,pid,public} \
        $RPM_BUILD_ROOT%{_var}/lib/postfix
 
-%{__rm} html/Makefile.in conf/{LICENSE,main.cf.default}
+%{__rm} -f html/Makefile.in conf/{LICENSE,main.cf.default}
 
 install -p bin/* $RPM_BUILD_ROOT%{_sbindir}
 install -p libexec/* $RPM_BUILD_ROOT%{_libdir}/postfix
@@ -329,10 +329,10 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.smtp
 
 > $RPM_BUILD_ROOT/var/spool/postfix/.nofinger
 
-%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/mail/makedefs.out
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mail/TLS_LICENSE
+%{__rm} -rf $RPM_BUILD_ROOT%{_sysconfdir}/mail/makedefs.out
+%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/TLS_LICENSE
 
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mail/{postfix-script,post-install}
+%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/mail/{postfix-script,post-install}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -430,11 +430,11 @@ fi
 %attr(755,root,root) /usr/lib/sendmail
 %dir %{_libdir}/postfix
 %attr(755,root,root) %{_libdir}/postfix/[!d]*
-%attr(755,root,root) %{_libdir}/postfix/!postfix-ldap.so
-%attr(755,root,root) %{_libdir}/postfix/!postfix-mysql.so
-%attr(755,root,root) %{_libdir}/postfix/!postfix-pcre.so
-%attr(755,root,root) %{_libdir}/postfix/!postfix-pgsql.so
-%attr(755,root,root) %{_libdir}/postfix/!postfix-sqlite.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-ldap.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-mysql.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-pcre.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-pgsql.so
+%attr(755,root,root) %exclude %{_libdir}/postfix/postfix-sqlite.so
 %attr(755,root,root) %{_libdir}/postfix/discard
 %attr(755,root,root) %{_libdir}/postfix/dnsblog
 %attr(755,root,root) %dir %{_var}/spool/postfix