summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-09-04 14:09:15 +0200
committerMichael Adam <obnox@samba.org>2008-09-08 14:43:37 +0200
commita9f162d9ec4bb3e3a52f91a2ab57d38dda94691c (patch)
treeef4547bd3e553dfa9f4894ad440dd03892f86f03
parent7089c800c19802c9ca7aaa6feceb8311af019020 (diff)
downloadsamba-a9f162d9ec4bb3e3a52f91a2ab57d38dda94691c.tar.gz
samba-a9f162d9ec4bb3e3a52f91a2ab57d38dda94691c.tar.bz2
samba-a9f162d9ec4bb3e3a52f91a2ab57d38dda94691c.zip
packaging(RHEL-CTDB): rename SRCDIR to RPMSRCDIR
Michael (cherry picked from commit d8a8ea87439315ecf407a866a12e2993343af39c) (This used to be commit ab7575f5d29576518bd5593ec5bd58846b85d23d)
-rwxr-xr-xpackaging/RHEL-CTDB/makerpms.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 485c810bdb..9479239968 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -17,9 +17,9 @@
EXTRA_OPTIONS="$1"
SPECDIR=`rpm --eval %_specdir`
-SRCDIR=`rpm --eval %_sourcedir`
+RPMSRCDIR=`rpm --eval %_sourcedir`
-# At this point the SPECDIR and SRCDIR variables must have a value!
+# At this point the SPECDIR and RPMSRCDIR variables must have a value!
DIRNAME=$(dirname $0)
@@ -44,7 +44,7 @@ esac
pushd ${DIRNAME}/../..
echo -n "Creating samba-${VERSION}.tar.bz2 ... "
-git archive --prefix=samba-${VERSION}/ HEAD | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2
+git archive --prefix=samba-${VERSION}/ HEAD | bzip2 > ${RPMSRCDIR}/samba-${VERSION}.tar.bz2
RC=$?
popd
echo "Done."
@@ -58,13 +58,13 @@ fi
## copy additional source files
##
if [ "x${DOCS_TARBALL}" != "x" ] && [ -f ${DOCS_TARBALL} ]; then
- cp ${DOCS_TARBALL} ${SRCDIR}/${DOCS}
+ cp ${DOCS_TARBALL} ${RPMSRCDIR}/${DOCS}
fi
pushd ${DIRNAME}
chmod 755 setup/filter-requires-samba.sh
-tar --exclude=.svn -jcvf - setup > ${SRCDIR}/setup.tar.bz2
+tar --exclude=.svn -jcvf - setup > ${RPMSRCDIR}/setup.tar.bz2
cp -p ${SPECFILE} ${SPECDIR}