introduce SYSARCH with real system arch, use it during work with spec and src.rpm packing

share/eterbuild/functions/build

@@ -160,10 +160,10 @@ do
 				sleep 10
 				exit 1
 			fi
-			uni_rpmbuild $COMMIT $i -bs $ARGS $NODEPS --target $DEFAULTARCH
+			uni_rpmbuild $COMMIT $i -bs $ARGS $NODEPS --target $SYSARCH
 		else
 			echog "Just packing \$NAMESRPMIN"
-			uni_rpmbuild $COMMIT $i -bs $ARGS $NODEPS --target $DEFAULTARCH || fatal "Error with rpmbuild"
+			uni_rpmbuild $COMMIT $i -bs $ARGS $NODEPS --target $SYSARCH || fatal "Error with rpmbuild"
 		fi
 
 		# Check the package really built

share/eterbuild/functions/config

@@ -3,7 +3,7 @@
 # Author: Vitaly Lipatov <lav@etersoft.ru>
 # Public domain
 
-ETERBUILDVERSION=183
+ETERBUILDVERSION=184
 
 SUDO="sudo"
 
@@ -18,10 +18,10 @@ OURTMPDIR=$TMPDIR
 [ -z "$OURTMPDIR" ] || [ -d "$OURTMPDIR" ] || OURTMPDIR=/tmp
 
 # detect our arch
-if [ ! -n "$DEFAULTARCH" ] ; then
-	DEFAULTARCH=$(uname -m)
-	[ "$DEFAULTARCH" = "x86_64" ] || DEFAULTARCH=i586
-fi
+SYSARCH=$(uname -m)
+[ "$SYSARCH" = "x86_64" ] || SYSARCH=i586
+
+[ -n "$DEFAULTARCH" ] || DEFAULTARCH=$SYSARCH
 
 NICE="nice"
 RPMBUILD=rpmbuild

share/eterbuild/functions/spec

@@ -18,9 +18,9 @@ eval_spec()
 	# Hack: just print spec if -bE failed
 	if is_alt ; then
 		# on ALT we have to done without errors
-		$RPMBUILD -bE --target $DEFAULTARCH $RPMBUILDARG $@ || fatal "Check spec's fields"
+		$RPMBUILD -bE --target $SYSARCH $RPMBUILDARG $@ || fatal "Check spec's fields"
 	else
-		$RPMBUILD -bE --target $DEFAULTARCH $RPMBUILDARG $@ 2>/dev/null || cat $1
+		$RPMBUILD -bE --target $SYSARCH $RPMBUILDARG $@ 2>/dev/null || cat $1
 	fi
 }