Commit f63b4bc5 authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix rpmbs packing after hasher build

parent 1246cea2
:
gear- rpmbsh -u,
src.rpm
: :
# etersoft-build-utils repack DIR - DIR NAME-VERSION # etersoft-build-utils repack DIR - DIR NAME-VERSION
# etersoft-build-utils remove DIR/FILE [DIR/FILE] - # etersoft-build-utils remove DIR/FILE [DIR/FILE] -
......
...@@ -72,10 +72,7 @@ add_changelog_helper "- new version" $LISTNAMES ...@@ -72,10 +72,7 @@ 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 set_specdir $LISTNAMES
if [ -r "$LISTNAMES" ] ; then
export SPECDIR=`dirname $LISTNAMES`
fi
if [ -n "$REMOTEBUILD" ] ; then if [ -n "$REMOTEBUILD" ] ; then
check_key check_key
...@@ -97,14 +94,6 @@ else ...@@ -97,14 +94,6 @@ else
cd $RPMTOPDIR/SRPMS && time $ETERBUILDBIN/myhsh $MENVARG $LISTRPMARGS $LISTBUILT cd $RPMTOPDIR/SRPMS && time $ETERBUILDBIN/myhsh $MENVARG $LISTRPMARGS $LISTBUILT
RESULT=$? RESULT=$?
# make src.rpm if build OK and we have options for rpmbs
if [ "$RESULT" = "0" ] && [ -n "$LISTRPMARGS" ]; then
if is_gear $SPECDIR ; then
$ETERBUILDBIN/rpmbs $MENVARG $LISTRPMARGS $LISTNAMES
else
$ETERBUILDBIN/rpmbs $MENVARG $LISTRPMARGS $LISTBUILT
fi
fi
date date
echo "-------------------------------" echo "-------------------------------"
...@@ -112,4 +101,13 @@ fi ...@@ -112,4 +101,13 @@ fi
cd - cd -
# make src.rpm if build OK and we have options for rpmbs
if [ "$RESULT" = "0" ] && [ -n "$LISTRPMARGS" ]; then
if is_gear $SPECDIR ; then
$ETERBUILDBIN/rpmbs $MENVARG $LISTRPMARGS $LISTNAMES
else
$ETERBUILDBIN/rpmbs $MENVARG $LISTRPMARGS $LISTBUILT
fi
fi
exit $RESULT exit $RESULT
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