From 39a17a1af884733a4ed5d5300fc48fea1d5cf83b Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Mon, 30 Mar 2015 08:20:09 -0400 Subject: [PATCH] Changed spin-rawhide git-description to match fedora package guidelines Prerelease snapshots require a YYYYMMDDgit style release version according to fedora package guidelines. Changing spin-rawhide to produce the same --- scripts/spin-rawhide | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/spin-rawhide b/scripts/spin-rawhide index 5e2a99cfc..e5accd6f6 100755 --- a/scripts/spin-rawhide +++ b/scripts/spin-rawhide @@ -32,12 +32,15 @@ cd systemtap-git # already existing git repo) APPLY_DIFF=1 DATE=`date +"%a %b %d %Y"` +TAG_DATE=`date +"%Y%m%d"` NAME=`git config --get-all user.name` EMAIL=`git config --get-all user.email` +TAG_DATE=`date +"%Y%m%d"` STAP_MAJOR_VERSION=`grep "^Version:" systemtap.spec` CHANGELOG_VERSION=`echo $STAP_MAJOR_VERSION | cut -f2 -d" "` -GIT_VERSION_TAG=`echo 0.$(git describe --abbrev=12 | rev | cut -f1,2 -d- --output-delimiter=. | rev)` - +#GIT_VERSION_TAG=`echo 0.$(git describe --abbrev=12 | rev | cut -f1,2 -d- --output-delimiter=. | rev)` +GIT_DESCRIBE=`git describe | rev | cut -f1 -d"g" | rev` +GIT_VERSION_TAG=`echo 0.${TAG_DATE}git${GIT_DESCRIBE}` ### lets do a sanity check first if which fedpkg &>/dev/null; then : -- 2.43.5