comparison 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
comparison
equal deleted inserted replaced
26832:3ed635cb108e 26833:6474b64045fb
46 echo 'You are not inside a Mercurial repository!' 1>&2 46 echo 'You are not inside a Mercurial repository!' 1>&2
47 exit 1 47 exit 1
48 fi 48 fi
49 49
50 gethgversion 50 gethgversion
51
52 # TODO: handle distance/node set, and type set
53
54 if [ -z "$type" ] ; then
55 release=1
56 else
57 release=0.9_$type
58 fi
59
60 if [ -n "$distance" ] ; then
61 release=$release+$distance_$node
62 fi
51 63
52 if [ "$PYTHONVER" ]; then 64 if [ "$PYTHONVER" ]; then
53 release=$release+$PYTHONVER 65 release=$release+$PYTHONVER
54 RPMPYTHONVER=$PYTHONVER 66 RPMPYTHONVER=$PYTHONVER
55 else 67 else