This revision was automatically updated to reflect the committed changes. Closed by commit rHGb7cd9e94c259: packaging: move buildrpm to contrib/packaging/ (authored by indygreg, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3546?vs=8666&id=8691 REVISION DETAIL https://phab.mercurial-scm.org/D3546 AFFECTED FILES Makefile contrib/buildrpm contrib/packaging/buildrpm contrib/packaging/dockerrpm CHANGE DETAILS diff --git a/contrib/packaging/dockerrpm b/contrib/packaging/dockerrpm --- a/contrib/packaging/dockerrpm +++ b/contrib/packaging/dockerrpm @@ -13,7 +13,7 @@ initcontainer $PLATFORM RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM -contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* +contrib/packaging/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $* DSHARED=/mnt/shared $DOCKER run -e http_proxy -e https_proxy -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \ diff --git a/contrib/buildrpm b/contrib/packaging/buildrpm rename from contrib/buildrpm rename to contrib/packaging/buildrpm --- a/contrib/buildrpm +++ b/contrib/packaging/buildrpm @@ -7,7 +7,7 @@ # - CentOS 5 # - centOS 6 -. $(dirname $0)/packaging/packagelib.sh +. $(dirname $0)/packagelib.sh BUILD=1 RPMBUILDDIR="$PWD/rpmbuild" @@ -35,7 +35,7 @@ esac done -cd "`dirname $0`/.." +cd "`dirname $0`/../.." specfile=$PWD/contrib/packaging/mercurial.spec if [ ! -f $specfile ]; then diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -247,7 +247,7 @@ fedora20: mkdir -p packages/fedora20 - contrib/buildrpm + contrib/packaging/buildrpm cp rpmbuild/RPMS/*/* packages/fedora20 cp rpmbuild/SRPMS/* packages/fedora20 rm -rf rpmbuild @@ -258,7 +258,7 @@ fedora21: mkdir -p packages/fedora21 - contrib/buildrpm + contrib/packaging/buildrpm cp rpmbuild/RPMS/*/* packages/fedora21 cp rpmbuild/SRPMS/* packages/fedora21 rm -rf rpmbuild @@ -269,7 +269,7 @@ centos5: mkdir -p packages/centos5 - contrib/buildrpm --withpython + contrib/packaging/buildrpm --withpython cp rpmbuild/RPMS/*/* packages/centos5 cp rpmbuild/SRPMS/* packages/centos5 @@ -279,7 +279,7 @@ centos6: mkdir -p packages/centos6 - contrib/buildrpm --withpython + contrib/packaging/buildrpm --withpython cp rpmbuild/RPMS/*/* packages/centos6 cp rpmbuild/SRPMS/* packages/centos6 @@ -289,7 +289,7 @@ centos7: mkdir -p packages/centos7 - contrib/buildrpm + contrib/packaging/buildrpm cp rpmbuild/RPMS/*/* packages/centos7 cp rpmbuild/SRPMS/* packages/centos7 To: indygreg, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
