- we want __cp and __find from coreutils and findutils respectively

- always use /bin/cp in posttrans to avoid macro confusion

diff --git a/macros.pld.in b/macros.pld.in
index 6ce1e783458bdc3b7557cbb7e326ac9e5f590fbc..cb03b1843a0df021fadbb5863ee12b00d834fea0 100644 (file)
--- 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

diff --git a/rpm.spec b/rpm.spec
index 5de0101744ded1be6fadd0a586829cc27aeb2070..9327799cde9b7051ece1c15f33183e2d5fe3b645 100644 (file)
--- 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