Commit 908f3f3c authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix SPECDIR using

parent 55f40717
...@@ -155,19 +155,28 @@ check_gear() ...@@ -155,19 +155,28 @@ check_gear()
{ {
local GEARCTAG=gear-create-tag local GEARCTAG=gear-create-tag
# create tag according to package release # create tag according to package release
SPECDIR=`dirname $LISTNAMES` # workaround about spaces in LISTNAMES
if [ -r "$(echo $LISTNAMES)" ] ; then
#echo wait SPECDIR from rpmbsh
#echo 1 $SPECDIR
[ -n "$SPECDIR" ] || SPECDIR=`dirname $LISTNAMES`
#echo 2 $SPECDIR
#pwd
fi
if is_gear $SPECDIR ; then if is_gear $SPECDIR ; then
# needed corrent user.name/user.email for get GPG id # needed corrent user.name/user.email for get GPG id
pushd $SPECDIR
$GEARCTAG --force $GEARCTAG --force
popd
# git push ? # git push ?
fi fi
} }
if [ -n "$SIGN" ]; then if [ -n "$SIGN" ]; then
release_check $LISTBUILT release_check $LISTBUILT
# workaround about spaces in LISTNAMES # workaround about spaces in LISTBUILT
if [ -r "$(echo $LISTNAMES)" ] ; then if [ -r "$(echo $LISTBUILT)" ] ; then
# if one spec, check gear echo if one spec, check gear
check_gear check_gear
fi fi
echog "Will try to sign follow packages with GPG: \$LISTBUILT" echog "Will try to sign follow packages with GPG: \$LISTBUILT"
......
...@@ -72,6 +72,15 @@ add_changelog_helper "- new version" $LISTNAMES ...@@ -72,6 +72,15 @@ add_changelog_helper "- new version" $LISTNAMES
# FIXME: # FIXME:
pack_src_rpm $(echo $LISTRPMARGS | sed -e "s|-[suUic]||g") pack_src_rpm $(echo $LISTRPMARGS | sed -e "s|-[suUic]||g")
# Hack to pass SPECDIR to rpmbs
# workaround about spaces in LISTNAMES
if [ -r "$(echo $LISTNAMES)" ] ; then
export SPECDIR=`dirname $LISTNAMES`
#echo 0 $SPECDIR
if [ "$SPECDIR" = "." ] ; then
SPECDIR=$(pwd)
fi
fi
if [ -n "$REMOTEBUILD" ] ; then if [ -n "$REMOTEBUILD" ] ; then
check_key check_key
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment