packages: xen/xen.spec - use __rm macro, to encourage cleaning up outdated ...

[glen]

Author: glen                         Date: Fri Jan 21 14:53:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use __rm macro, to encourage cleaning up outdated rm (like xen-3.2 likely was)

---- Files affected:
packages/xen:
   xen.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: packages/xen/xen.spec
diff -u packages/xen/xen.spec:1.83 packages/xen/xen.spec:1.84
--- packages/xen/xen.spec:1.83	Fri Jan 21 15:51:31 2011
+++ packages/xen/xen.spec	Fri Jan 21 15:53:39 2011
@@ -202,8 +202,8 @@
 	XEN_PYTHON_NATIVE_INSTALL=1
 
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/xend
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/xendomains
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/xend
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/xendomains
 
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/xend-db/{domain,vnet}
 install -d $RPM_BUILD_ROOT%{_sharedstatedir}/xen/save
@@ -216,21 +216,20 @@
 
 %py_postclean
 # remove unneeded files
-rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
-rm -rf $RPM_BUILD_ROOT%{_docdir}/xen
-rm -rf $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html
-rm -rf $RPM_BUILD_ROOT/''etc/init.d
-rm -f $RPM_BUILD_ROOT/boot/xen-3.2.gz
-rm -f $RPM_BUILD_ROOT/boot/xen-3.4.gz
-rm -f $RPM_BUILD_ROOT/boot/xen-3.gz
-# # strip - Unable to recognise the format of the input file
-# rm -f $RPM_BUILD_ROOT%{_datadir}/xen/qemu/openbios-sparc32
-# rm -f $RPM_BUILD_ROOT%{_datadir}/xen/qemu/openbios-sparc64
-
+%{__rm} $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/xen
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html
+%{__rm} -r $RPM_BUILD_ROOT/''etc/init.d
+%{__rm} $RPM_BUILD_ROOT/boot/xen-3.4.gz
+%{__rm} $RPM_BUILD_ROOT/boot/xen-3.gz
+
+# strip - Unable to recognise the format of the input file
+# %{__rm} $RPM_BUILD_ROOT%{_datadir}/xen/qemu/openbios-sparc32
+# %{__rm} $RPM_BUILD_ROOT%{_datadir}/xen/qemu/openbios-sparc64
 
 # conflict with qemu
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/qemu-img.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/qemu.1
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/qemu-img.1
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/qemu.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -340,6 +339,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2011/01/21 14:53:39  glen
+- use __rm macro, to encourage cleaning up outdated rm (like xen-3.2 likely was)
+
 Revision 1.83  2011/01/21 14:51:31  glen
 - restore utf8 symbols
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xen/xen.spec?r1=1.83&r2=1.84&f=u