Skip to content

E
etersoft-build-utils
Commit 8549bcc2 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

spec: fix eval spec on non ALT platforms

parent bed92ec6
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
bin/rpmbps
View file @ 8549bcc2
...@@ -368,6 +368,8 @@ if [ -n "$VERBOSE" ] ; then ...@@ -368,6 +368,8 @@ if [ -n "$VERBOSE" ] ; then
echo echo
echo "cat $SPECNAME" echo "cat $SPECNAME"
cat $SPECNAME cat $SPECNAME
echo "--- eval spec -----------"
eval_spec $SPECNAME
fi fi
......
share/eterbuild/functions/spec
View file @ 8549bcc2
...@@ -12,7 +12,6 @@ get_var() ...@@ -12,7 +12,6 @@ get_var()
} }
# TODO: create temp spec, not just output: it masks specs problem now # TODO: create temp spec, not just output: it masks specs problem now
# FIXME: only ALT handled rpm -bE
# Раскрывает макросы в спеке и выводит на стандартный вывод # Раскрывает макросы в спеке и выводит на стандартный вывод
eval_spec() eval_spec()
{ {
...@@ -41,7 +40,7 @@ eval_spec() ...@@ -41,7 +40,7 @@ eval_spec()
# on ALT we have to done without errors # on ALT we have to done without errors
$USEARCH $RPMBUILD -bE --with=test --target $SYSARCH $RPMBUILDARG $SPEC | iconv -f utf8 -r || fatal "Check spec's fields" $USEARCH $RPMBUILD -bE --with=test --target $SYSARCH $RPMBUILDARG $SPEC | iconv -f utf8 -r || fatal "Check spec's fields"
else else
( $USEARCH $RPMBUILD -bE --target $SYSARCH $RPMBUILDARG $SPEC 2>/dev/null || cat $SPEC ) | iconv -f utf8 ( a= $USEARCH rpmspec -P --target $SYSARCH $RPMBUILDARG $SPEC 2>/dev/null || cat $SPEC ) | iconv -f utf8
fi fi
# FIXME: hack for koi8-r in spec (grep will not work with it) # FIXME: hack for koi8-r in spec (grep will not work with it)
[ -n "$DEBUG" ] || rm -f $SPECNAMETMP $SPECNAMECHANGELOG [ -n "$DEBUG" ] || rm -f $SPECNAMETMP $SPECNAMECHANGELOG
......
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