[oe-commits] Rob Bradford : package_rpm.bbclass: Don't use the system wide RPM macros.

[GIT User account]

Module: openembedded.git
Branch: hrw/poky-rpm
Commit: db808b43bb6e7d7d6778662e0d2a4c6c3897daac
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=db808b43bb6e7d7d6778662e0d2a4c6c3897daac

Author: Rob Bradford <rob at openedhand.com>
Date:   Wed Nov 19 17:02:43 2008 +0100

package_rpm.bbclass: Don't use the system wide RPM macros.

This fixes the build on Fedora 10 where the RPM system macros obliterate
the value of BuildRoot that is set in the spec file.

---

 classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 32e5f82..f6cb2c6 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -136,7 +136,7 @@ python write_specfile() {
 rpm_prep() {
 	if [ ! -e ${WORKDIR}/rpmrc ]; then
 		mkdir -p ${RPMBUILDPATH}/{SPECS,RPMS/{i386,i586,i686,noarch,ppc,mips,mipsel,arm},SRPMS,SOURCES,BUILD}
-		echo 'macrofiles:/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
+		echo 'macrofiles:${STAGING_DIR_NATIVE}/usr/lib/rpm/macros:${WORKDIR}/macros' > ${WORKDIR}/rpmrc
 		echo '%_topdir ${RPMBUILDPATH}' > ${WORKDIR}/macros
 		echo '%_repackage_dir ${WORKDIR}' >> ${WORKDIR}/macros
 	fi