packages: cyrus-imapd/cyrus-imapd.spec - cosmetics

[glen]

Author: glen                         Date: Wed Dec  7 12:15:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
packages/cyrus-imapd:
   cyrus-imapd.spec (1.153 -> 1.154) 

---- Diffs:

================================================================
Index: packages/cyrus-imapd/cyrus-imapd.spec
diff -u packages/cyrus-imapd/cyrus-imapd.spec:1.153 packages/cyrus-imapd/cyrus-imapd.spec:1.154
--- packages/cyrus-imapd/cyrus-imapd.spec:1.153	Fri Sep  9 13:04:59 2011
+++ packages/cyrus-imapd/cyrus-imapd.spec	Wed Dec  7 13:15:02 2011
@@ -195,6 +195,8 @@
 
 rm -rf autom4te.cache
 
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE4} %{SOURCE5} .
+
 %build
 cd makedepend
 %{__libtoolize}
@@ -246,20 +248,19 @@
 	CYRUS_GROUP=%(id -g) \
 	INSTALLDIRS=vendor
 
-install deliver-wrapper $RPM_BUILD_ROOT%{_libexecdir}/deliver-wrapper
+install -p deliver-wrapper $RPM_BUILD_ROOT%{_libexecdir}/deliver-wrapper
 
-install %{SOURCE1}	%{SOURCE2} %{SOURCE4} %{SOURCE5} .
-install %{SOURCE6}	$RPM_BUILD_ROOT/etc/logrotate.d/cyrus-imapd
-install %{SOURCE7}	$RPM_BUILD_ROOT%{_sysconfdir}/imapd.conf
-install %{SOURCE9}	$RPM_BUILD_ROOT/etc/pam.d/imap
-install %{SOURCE10}	$RPM_BUILD_ROOT/etc/pam.d/pop
+cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/cyrus-imapd
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/imapd.conf
+cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/imap
+cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/pam.d/pop
 sed -e 's,/''usr/lib/cyrus,%{_libexecdir},' %{SOURCE11} > $RPM_BUILD_ROOT/etc/rc.d/init.d/cyrus-imapd
 sed -e 's,/''usr/lib/cyrus,%{_libexecdir},' %{SOURCE13} > $RPM_BUILD_ROOT/etc/rc.d/init.d/cyrus-sync
-install %{SOURCE12}	$RPM_BUILD_ROOT%{_sysconfdir}/cyrus.conf
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cyrus.conf
 
-mv -f $RPM_BUILD_ROOT%{_libexecdir}/master	$RPM_BUILD_ROOT%{_libexecdir}/cyrus-master
-mv -f $RPM_BUILD_ROOT%{_mandir}/man8/master.8	$RPM_BUILD_ROOT%{_mandir}/man8/cyrus-master.8
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/idled.8
+mv -f $RPM_BUILD_ROOT%{_libexecdir}/master $RPM_BUILD_ROOT%{_libexecdir}/cyrus-master
+mv -f $RPM_BUILD_ROOT%{_mandir}/man8/master.8 $RPM_BUILD_ROOT%{_mandir}/man8/cyrus-master.8
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/idled.8
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{imap,pop3}
 
@@ -273,7 +274,7 @@
 
 %if %{with perl}
 find $RPM_BUILD_ROOT%{perl_vendorarch} -name .packlist | xargs rm -v
-rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 %endif
 
 %clean
@@ -427,6 +428,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2011/12/07 12:15:02  glen
+- cosmetics
+
 Revision 1.153  2011/09/09 11:04:59  marti
 - up to 2.4.11
 - fixes CVE-2011-3208
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-imapd/cyrus-imapd.spec?r1=1.153&r2=1.154&f=u