From a70464dcba932a8a001833f92a119ed5a0153d2e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 4 Sep 2008 14:09:36 +0200 Subject: [PATCH] packaging(RHEL-CTDB): rename SPECDIR to RPMSPECDIR Michael (cherry picked from commit ac2b09b2274a12c34c446c4536793a33515958cc) (cherry picked from commit ae88c6b45a3f0dad125b292622fb7e34c3645e22) --- packaging/RHEL-CTDB/makerpms.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh index 94792399687..f436f0c3fc4 100755 --- a/packaging/RHEL-CTDB/makerpms.sh +++ b/packaging/RHEL-CTDB/makerpms.sh @@ -16,10 +16,10 @@ # extra options passed to rpmbuild EXTRA_OPTIONS="$1" -SPECDIR=`rpm --eval %_specdir` +RPMSPECDIR=`rpm --eval %_specdir` RPMSRCDIR=`rpm --eval %_sourcedir` -# At this point the SPECDIR and RPMSRCDIR variables must have a value! +# At this point the RPMSPECDIR and RPMSRCDIR variables must have a value! DIRNAME=$(dirname $0) @@ -66,7 +66,7 @@ pushd ${DIRNAME} chmod 755 setup/filter-requires-samba.sh tar --exclude=.svn -jcvf - setup > ${RPMSRCDIR}/setup.tar.bz2 -cp -p ${SPECFILE} ${SPECDIR} +cp -p ${SPECFILE} ${RPMSPECDIR} popd @@ -74,7 +74,7 @@ popd ## Build ## echo "$(basename $0): Getting Ready to build release package" -pushd ${SPECDIR} +pushd ${RPMSPECDIR} ${RPM} -ba $EXTRA_OPTIONS $SPECFILE if [ "x$?" = "x0" ] && [ `arch` = "x86_64" ]; then echo "Building 32 bit winbind libs" -- 2.11.4.GIT