small compatibility fixes

share/eterbuild/functions/build

@@ -24,10 +24,6 @@ uni_rpmbuild()
 
 	local SPECNAME="$1"
 	local SPECDIR=`dirname $SPECNAME`
-	local GEAR="gear -v"
-
-	$EPMCMD assure gear
-
 	local THRPARAM="--quiet"
 	[ -n "$USE_VENDOR" ] && THRPARAM="--define=_vendor $USE_VENDOR"
 
@@ -49,6 +45,9 @@ uni_rpmbuild()
 		[ -f "$SPECNAME" ] || fatal "run uni_rpmbuild with spec as 2nd parameter"
 		shift # skip spec name
 
+		local GEAR="gear -v"
+		$EPMCMD assure gear || fatal
+
 		# FIXME: use spec name as project name
 		GEARRULES=$(get_gear_rules_by_spec "$SPECNAME")
 

share/eterbuild/functions/buildsrpm

@@ -24,10 +24,6 @@ uni_rpmbuildsrpm()
 	local SPECDIR
 	set_specdir $SPECNAME || fatal "Dir for $SPECNAME does not exists"
 
-	local GEAR=gear
-
-	$EPMCMD assure gear
-
 	local ONEPARAM="--quiet"
 	[ -n "$USE_LEGACY_COMPRESSION" ] && ONEPARAM="--define=_source_payload w9.gzdio"
 
@@ -43,6 +39,9 @@ uni_rpmbuildsrpm()
 		[ -f "$SPECNAME" ] || fatal "run uni_rpmbuild with spec as 2nd parameter"
 		shift # skip spec name
 
+		local GEAR=gear
+		$EPMCMD assure gear || fatal
+
 		# FIXME: use spec name as project name
 		GEARRULES=$(get_gear_rules_by_spec "$SPECNAME")
 

share/eterbuild/functions/spec

@@ -37,10 +37,10 @@ eval_spec()
 	# Hack: just print spec if -bE failed
 	if is_alt ; then
 		# on ALT we have to done without errors
-		$USEARCH $RPMBUILD -bE --target $SYSARCH $RPMBUILDARG $SPEC || fatal "Check spec's fields"
+		$USEARCH $RPMBUILD -bE --target $SYSARCH $RPMBUILDARG $SPEC | iconv -f utf8 -r || fatal "Check spec's fields"
 	else
-		$USEARCH $RPMBUILD -bE --target $SYSARCH $RPMBUILDARG $SPEC 2>/dev/null || cat $SPEC
-	fi | iconv -f utf8 -r
+		( $USEARCH $RPMBUILD -bE --target $SYSARCH $RPMBUILDARG $SPEC 2>/dev/null || cat $SPEC ) | iconv -f utf8 
+	fi
 	# FIXME: hack for koi8-r in spec (grep will not work with it)
 	[ -n "$DEBUG" ] || rm -f $SPECNAME.tmp $SPECNAME.changelog
 	remove_file_from_remove $SPECNAME.tmp $SPECNAME.changelog