- check for upper-case alpha|beta|pre|rc too

[packages/rpm-build-tools.git] / builder.sh

diff --git a/builder.sh b/builder.sh
index 16ff54f575e763bf5882c9426d0b673a1b349968..0c5d02e050a04f72ba1aca4e883baafdbfe1fed4 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -211,7 +211,7 @@ cache_rpm_dump () {
 
 rpm_dump () {
     if [ -z "$rpm_dump_cache" ] ; then
-        echo "internal error: cache_rpm_dump not called!" 1>&2
+       echo "internal error: cache_rpm_dump not called!" 1>&2
     fi
     echo "$rpm_dump_cache"
 }
@@ -586,6 +586,10 @@ tag_files()
     if [ -n "$1$2$3$4$5$6$7$8$9${10}" ]; then
        echo "Version: $PACKAGE_VERSION"
        echo "Release: $PACKAGE_RELEASE"
+       # Check whether first character of PACKAGE_NAME is legal for tag name
+       if [ -z "${PACKAGE_NAME##[_0-9]*}" -a -z "$TAG_PREFIX" ]; then
+           TAG_PREFIX=tag_
+       fi
        TAGVER=$TAG_PREFIX$PACKAGE_NAME-`echo $PACKAGE_VERSION | sed -e "s/\./\_/g" -e "s/@/#/g"`-`echo $PACKAGE_RELEASE | sed -e "s/\./\_/g" -e "s/@/#/g"`
        # Remove #kernel.version_release from TAGVER because tagging sources
        # could occur with different kernel-headers than kernel-headers used at build time.
@@ -677,7 +681,7 @@ build_package()
 
     if [ -n "$TRY_UPGRADE" ]; then
 
-       if [ -n "FLOAT_VERSION" ]; then
+       if [ -n "$FLOAT_VERSION" ]; then
            TNOTIFY=`./pldnotify.awk $SPECFILE -n`
        else
            TNOTIFY=`./pldnotify.awk $SPECFILE`
@@ -724,7 +728,7 @@ build_package()
            echo "LASTLOG=$LOG" > $LASTLOG_FILE
        fi
        RES_FILE=~/tmp/$RPMBUILD-exit-status.$RANDOM
-       (nice -n ${DEF_NICE_LEVEL} time $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
+       (time nice -n ${DEF_NICE_LEVEL} $RPMBUILD $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $BCOND $SPECFILE; echo $? > $RES_FILE) 2>&1 |tee $LOG
        RETVAL=`cat $RES_FILE`
        rm $RES_FILE
        if [ -n "$LOGDIROK" ] && [ -n "$LOGDIRFAIL" ]; then