# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1452210714 21600
# Node ID bd706395351bf4dc80a09f687e938fe4d36ad723
# Parent  174069440929ba2fb9a0ea81e7d79f90f298da94# Parent  1292700d31b520a0af73cd5515b6d10a3f7af7cd
merge with stable

diff -r 174069440929 -r bd706395351b contrib/dockerrpm
--- a/contrib/dockerrpm	Fri Jan 01 22:35:34 2016 +0900
+++ b/contrib/dockerrpm	Thu Jan 07 17:51:54 2016 -0600
@@ -15,6 +15,8 @@
 RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
 contrib/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
 
+mkdir -p $RPMBUILDDIR/{BUILD,SRPMS,RPMS}
+
 DSHARED=/mnt/shared
 $DOCKER run -u $DBUILDUSER --rm -v $RPMBUILDDIR:$DSHARED $CONTAINER \
     rpmbuild --define "_topdir $DSHARED" -ba $DSHARED/SPECS/mercurial.spec --clean