summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-09-04 14:09:36 +0200
committerMichael Adam <obnox@samba.org>2008-09-08 14:43:38 +0200
commita38b80fb06f045191f7d102eec7a51f3fa61bbe6 (patch)
treee929de72b2860554756e162898f0e12bbd8b2200
parenta9f162d9ec4bb3e3a52f91a2ab57d38dda94691c (diff)
downloadsamba-a38b80fb06f045191f7d102eec7a51f3fa61bbe6.tar.gz
samba-a38b80fb06f045191f7d102eec7a51f3fa61bbe6.tar.bz2
samba-a38b80fb06f045191f7d102eec7a51f3fa61bbe6.zip
packaging(RHEL-CTDB): rename SPECDIR to RPMSPECDIR
Michael (cherry picked from commit ac2b09b2274a12c34c446c4536793a33515958cc) (This used to be commit cbfd805bd25a23299ef770687370dafebefe58d1)
-rwxr-xr-xpackaging/RHEL-CTDB/makerpms.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 9479239968..f436f0c3fc 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"