RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Dec-2007 19:41:22
Branch: HEAD Handle: 2007121718412200
Modified files:
rpm macros.in
Log:
Just to be more consistant: if we are doing the 'rm' conditionally for
'%install' then let's do it conditionally for '%clean', too.
Summary:
Revision Changes Path
1.214 +2 -2 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.213 -r1.214 macros.in
--- rpm/macros.in 17 Dec 2007 17:44:52 -0000 1.213
+++ rpm/macros.in 17 Dec 2007 18:41:22 -0000 1.214
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.213 2007/12/17 17:44:52 jbj Exp $
+# $Id: macros.in,v 1.214 2007/12/17 18:41:22 rse Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -1175,7 +1175,7 @@
%__spec_clean_args %{___build_args}
%__spec_clean_cmd %{___build_cmd}
%__spec_clean_pre %{___build_pre}
-%__spec_clean_body %{__rm} -rf '%{buildroot}'\
+%__spec_clean_body %{?buildroot:%{__rm} -rf '%{buildroot}'}\
%{nil}
%__spec_clean_post %{nil}
%__spec_clean_template #!%{__spec_clean_cmd}\
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
