[packages/rpm] - we want __cp and __find from coreutils and findutils respectively - always use /bin/cp in posttran

[baggins]

commit 38f68757be8a9eb00cd8b56453513126809ffb12
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Sep 20 23:18:43 2012 +0200

    - we want __cp and __find from coreutils and findutils respectively
    - always use /bin/cp in posttrans to avoid macro confusion

 macros.pld.in | 2 ++
 rpm.spec      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 5de0101..9327799 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1124,7 +1124,7 @@ fi
 if [ -x %{_rpmlibdir}/bin/rpmdb_checkversion ] && \
 		! %{_rpmlibdir}/bin/rpmdb_checkversion -h /var/lib/rpm -d /var/lib/rpm ; then
 	if [ ! -e /var/lib/rpm.rpmbackup-%{version}-%{release} ] && \
-			%{__cp} -a /var/lib/rpm /var/lib/rpm.rpmbackup-%{version}-%{release} ; then
+			/bin/cp -a /var/lib/rpm /var/lib/rpm.rpmbackup-%{version}-%{release} ; then
 		echo
 		echo "Backup of the rpm database has been created in /var/lib/rpm.rpmbackup-%{version}-%{release}"
 		echo
diff --git a/macros.pld.in b/macros.pld.in
index 6ce1e78..cb03b18 100644
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -94,6 +94,8 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 #---------------------------------------------------------------------
 # Overwrite RPM macros with PLD specific one here.
 
+%__cp			/bin/cp
+%__find			/usr/bin/find
 %__grep			/bin/grep
 %__lua			%{_bindir}/lua
 %__rc			%{_bindir}/rc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/001298417a81dc8620666bf5ea03cff38f137b45