rpms/cyrus-imapd/devel cyrus-imapd.spec,1.32,1.33

[Tomas Janousek (tjanouse)]

Author: tjanouse

Update of /cvs/extras/rpms/cyrus-imapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15150

Modified Files:
	cyrus-imapd.spec 
Log Message:
A few review-related changes in specfile.



Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cyrus-imapd.spec	25 Sep 2007 09:17:00 -0000	1.32
+++ cyrus-imapd.spec	15 Oct 2007 16:31:43 -0000	1.33
@@ -354,18 +354,18 @@
 %{__rm} -f doc/Makefile.dist*
 %{__rm} -f doc/text/htmlstrip.c
 
-%{__install} -m 644 %{SOURCE23}	doc/README.RPM
-%{__install} -m 644 %{SOURCE24}	doc/README.HOWTO-recover-mailboxes.db
+%{__install} -m 644 %{SOURCE23} doc/README.RPM
+%{__install} -m 644 %{SOURCE24} doc/README.HOWTO-recover-mailboxes.db
 %{__install} -m 644 %{SOURCE33} doc/README.skiplist_recovery
 %if %{AUTOCREATE}
 %{__install} -m 644 %{SOURCE8}  doc/README.autocreate
 %{__install} -m 644 %{SOURCE9}  doc/README.autosievefolder
 %endif
 %{__install} -d doc/m4
-%{__install} -m 644 %{SOURCE26}	doc/m4/cyrus-procmailrc
-%{__install} -m 644 %{SOURCE4}	doc/m4/cyrus-user-procmailrc.template
-%{__install} -m 644 %{SOURCE27}	doc/m4/%{name}-procmail+cyrus.mc
-%{__install} -m 644 %{SOURCE29}	doc/m4/%{name}-sendmail-8.12.9-cyrusv2.m4
+%{__install} -m 644 %{SOURCE26} doc/m4/cyrus-procmailrc
+%{__install} -m 644 %{SOURCE4}  doc/m4/cyrus-user-procmailrc.template
+%{__install} -m 644 %{SOURCE27} doc/m4/%{name}-procmail+cyrus.mc
+%{__install} -m 644 %{SOURCE29} doc/m4/%{name}-sendmail-8.12.9-cyrusv2.m4
 
 # modify lmtp socket path in .conf files
 %{__perl} -pi -e "s@/var/imap/@%{_vardata}/@" %{_confdir}/*.conf doc/cyrusv2.mc doc/m4/%{name}-sendmail-8.12.9-cyrusv2.m4
@@ -378,7 +378,7 @@
 %endif
 
 %install
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 # This hack is needed on RedHat > 7.3 to install the perl files correctly
 %if %{_perlhack}
@@ -474,7 +474,7 @@
  %{buildroot}%{_sysconfdir}/imapd.conf
 %endif
 
-# Rename 'master' binary and manpage to avoid crash with postfix
+# Rename 'master' binary and manpage to avoid clash with postfix
 %{__mv} -f %{buildroot}%{_cyrexecdir}/master         %{buildroot}%{_cyrexecdir}/cyrus-master
 %{__mv} -f %{buildroot}%{_mandir}/man8/master.8      %{buildroot}%{_mandir}/man8/cyrus-master.8
 %{__mv} -f doc/man/master.8.html                     doc/man/cyrus-master.8.html
@@ -485,7 +485,7 @@
 %{__perl} -pi -e 's/Master/Cyrus-master/g'           doc/man/cyrus-master.8.html
 %{__perl} -pi -e 's/MASTER/CYRUS-MASTER/g'           doc/man/cyrus-master.8.html
 
-# Rename 'fetchnews' binary and manpage to avoid crash with leafnode
+# Rename 'fetchnews' binary and manpage to avoid clash with leafnode
 %{__mv} -f %{buildroot}%{_cyrexecdir}/fetchnews      %{buildroot}%{_cyrexecdir}/cyrfetchnews
 %{__mv} -f %{buildroot}%{_mandir}/man8/fetchnews.8   %{buildroot}%{_mandir}/man8/cyrfetchnews.8
 %{__mv} -f doc/man/fetchnews.8.html                  doc/man/cyrfetchnews.8.html
@@ -528,7 +528,7 @@
 %{__rm} -f /perllocal.pod
 
 %clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
+%{__rm} -rf %{buildroot}
 
 %pre
 # Let postun know whether cyrus-imapd was running
@@ -679,8 +679,8 @@
 %defattr(0644,root,root,0755)
 %config(noreplace) %{_sysconfdir}/cyrus.conf
 %config(noreplace) %{_sysconfdir}/imapd.conf
-%attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
-%config %{_sysconfdir}/logrotate.d/%{name}
+%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/pop
 %config(noreplace) %{_sysconfdir}/pam.d/imap
@@ -689,7 +689,7 @@
 %config(noreplace) %{_sysconfdir}/pam.d/mupdate
 %config(noreplace) %{_sysconfdir}/pam.d/csync
 %config(noreplace) %{_sysconfdir}/pam.d/nntp
-%attr(0755,root,root) %config %{_sysconfdir}/cron.daily/%{name}
+%attr(0755,root,root) %{_sysconfdir}/cron.daily/%{name}
 %dir %{_cyrexecdir}
 %attr(0755,root,root) %{_cyrexecdir}/arbitron
 %attr(0755,root,root) %{_cyrexecdir}/arbitronsort.pl