diff -r 5337cb17fa1f -r 57e0f053e529 contrib/buildrpm --- a/contrib/buildrpm Tue May 20 03:57:21 2014 +0200 +++ b/contrib/buildrpm Thu May 15 01:48:37 2014 +0200 @@ -8,9 +8,6 @@ # - centOS 6 cd "`dirname $0`/.." -HG="$PWD/hg" -PYTHONPATH="$PWD/mercurial/pure" -export PYTHONPATH specfile=contrib/mercurial.spec if [ ! -f $specfile ]; then @@ -31,13 +28,17 @@ fi fi +# build local hg and use it +python setup.py build_py -c -d . +HG="$PWD/hg" +PYTHONPATH="$PWD/mercurial/pure" +export PYTHONPATH + rpmdir="$PWD/rpmbuild" rm -rf $rpmdir mkdir -p $rpmdir/SOURCES $rpmdir/SPECS $rpmdir/RPMS $rpmdir/SRPMS $rpmdir/BUILD -# make setup.py build the version string -python setup.py build_py -c -d . hgversion=`$HG version | sed -ne 's/.*(version \(.*\))$/\1/p'` if echo $hgversion | grep -- '-' > /dev/null 2>&1; then