Skip to content

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

functions/spec: remove iconv from eval_spec

Remove iconv -f utf8 -r and iconv -f utf8 from spec evaluation. This fixes issues with spec parsing.
parent 6aa16fff
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
share/eterbuild/functions/spec
View file @ 4eaba887
...@@ -38,9 +38,9 @@ eval_spec() ...@@ -38,9 +38,9 @@ eval_spec()
# Hack: just print spec if -bE failed # Hack: just print spec if -bE failed
if is_alt ; then if is_alt ; then
# 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 || fatal "Check spec's fields"
else else
( a= $USEARCH rpmspec -P --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 )
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