Author: glen Date: Mon Mar 5 18:04:47 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- cosmetics and locals
---- Files affected:
SPECS:
builder (1.489 -> 1.490)
---- Diffs:
================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.489 SPECS/builder:1.490
--- SPECS/builder:1.489 Mon Mar 5 18:07:37 2007
+++ SPECS/builder Mon Mar 5 19:04:41 2007
@@ -426,7 +426,6 @@
%_sourcedir ./
EOF
fi
-# set -x
eval $RPMBUILD --rcfile .builder-rpmrc $QUIET $RPMOPTS $RPMBUILDOPTS
$BCOND $TARGET_SWITCH $* 2>&1
}
@@ -1081,10 +1080,18 @@
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"`
+
+ # NOTE: CVS tags may must not contain the characters `$,.:;@'
+ TAGVER=$TAG_PREFIX$PACKAGE_NAME-$(echo $PACKAGE_VERSION | tr '[EMAIL
PROTECTED]' '[_#]')-$(echo $PACKAGE_RELEASE | tr '[EMAIL PROTECTED]' '[_#]')
+
# Remove #kernel.version_release from TAGVER because tagging sources
# could occur with different kernel-headers than kernel-headers used at
build time.
- TAGVER=$(echo "$TAGVER" | sed -e 's/#.*//g')
+ # besides, %{_kernel_ver_str} is not expanded.
+
+ # TAGVER=auto-ac-madwifi-ng-0-0_20070225_1#%{_kernel_ver_str}
+ # TAGVER=auto-ac-madwifi-ng-0-0_20070225_1
+
+ TAGVER=${TAGVER%#*}
echo -n "$TAGVER"
}
@@ -1100,7 +1107,7 @@
echo "Version: $PACKAGE_VERSION"
echo "Release: $PACKAGE_RELEASE"
- TAGVER=`make_tagver`
+ local TAGVER=`make_tagver`
if [ "$TAG_VERSION" = "yes" ]; then
echo "CVS tag: $TAGVER"
@@ -2136,7 +2143,7 @@
fi
fi
- TAGVER=`make_tagver`
+ local TAGVER=`make_tagver`
echo "Searching for tag $TAGVER..."
TAGREL=$(cvs status -v $SPECFILE | grep -E
"^[[:space:]]*${TAGVER}[[[:space:]]" | sed -e 's#.*(revision: ##g' -e
's#).*##g')
if [ -n "$TAGREL" ]; then
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/builder?r1=1.489&r2=1.490&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
