Mercurial > hg
diff contrib/buildrpm @ 26833:6474b64045fb stable
packaging: rework version detection and declaration (issue4912)
Previously the -rc in our rc tags got dropped, meaning that those
packages looked newer to the packaging system than the later release
build. This rectifies the issue, though some damage may already have
been done on 3.6-rc builds.
I'm mostly cargo-culting the RPM version format - there don't appear
to be rules for RPM about how to handle this. Hopefully an RPM
enthusiast can fix up what I've done as a followup.
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 26 Oct 2015 14:19:37 -0400 |
parents | ec74ea542201 |
children | d713fa934fb9 |
line wrap: on
line diff
--- a/contrib/buildrpm Tue Oct 27 12:34:05 2015 +0800 +++ b/contrib/buildrpm Mon Oct 26 14:19:37 2015 -0400 @@ -49,6 +49,18 @@ gethgversion +# TODO: handle distance/node set, and type set + +if [ -z "$type" ] ; then + release=1 +else + release=0.9_$type +fi + +if [ -n "$distance" ] ; then + release=$release+$distance_$node +fi + if [ "$PYTHONVER" ]; then release=$release+$PYTHONVER RPMPYTHONVER=$PYTHONVER