From 8916b9039185d63a258c4d51df2985e32a42ad6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Fri, 11 Sep 2015 11:10:55 +0000 Subject: [PATCH] new feature resolve-rpmbuilddeps.sh --- resolve-rpmbuilddeps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resolve-rpmbuilddeps.sh b/resolve-rpmbuilddeps.sh index efa546f..386ab71 100755 --- a/resolve-rpmbuilddeps.sh +++ b/resolve-rpmbuilddeps.sh @@ -13,9 +13,8 @@ SCHROOTNAME="$1" PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac) -sed 's,@[^@]*@,dummytext,g' ${PACKAGE_NAME}.spec.in > ${PACKAGE_NAME}.spec - if test -n "${SCHROOTNAME}"; then + schroot -c ${SCHROOTNAME} -- ./bootstrap.sh -t dist FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') if test -n "${FILES}"; then schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FILES} || \ @@ -23,6 +22,7 @@ if test -n "${SCHROOTNAME}"; then schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FILES} fi else + ./bootstrap.sh -t dist FILES=$(LANG= rpmbuild -bb --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p') if test -n "${FILES}"; then yum install -y ${FILES} || \