Skip to content

Commit 3b98068

Browse files
committed
attempt to fix version string detection
1 parent fe1fdd1 commit 3b98068

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

rpm/build_myth.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,11 @@ EOF
274274
fi
275275
GITVER=`echo "$DESCRIBE" | sed -e 's,^\([^-]\+\)-.\+$,\1,'`
276276
GITREV=`echo "$DESCRIBE" | sed -e 's,^[^-]\+-,,' -e 's,-,.,'`
277-
# do some magic here to detect v, b, or pre notations
278-
if [[ $GITVER =~ pre$ ]]; then
277+
# do some magic here to detect v, b, rc, or pre notations
278+
if [[ $GITREV =~ ^rc ]]; then
279+
GITVER=${GITVER#v}
280+
GITREV="0.0.$GITREV"
281+
elif [[ $GITVER =~ pre$ ]]; then
279282
GITVER=${GITVER#v}
280283
GITVER=${GITVER%pre}
281284
elif [[ $GITVER =~ ^v ]]; then

rpm/mythtv.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
%define desktop_vendor mythtv
6565

6666
# MythTV Version string -- preferably the output from git --describe
67-
%define vers_string v0.25-beta-99-gff73126
67+
%define vers_string v0.25-rc
6868

6969
# Git Revision number and branch
7070
%define _gitrev 1

0 commit comments

Comments
 (0)