small fixes

bin/rpmbps

@@ -140,13 +140,9 @@ else
 		fi
 	fi
 
-	# hack against very straight patch command
-	FIXPATCHFUZZ="%define _default_patch_fuzz 3"
-	# see install in Korinf, need concatenate
-	BUILDREQ="$BUILDREQ make gcc\n$FIXPATCHFUZZ"
-
 	if build32on64 ; then
-		[ "$DISTRNAME" = "Debian" ] && BUILDREQ="$BUILDREQ ia32-libs" && ADDREQUIRES="$ADDREQUIRES ia32-libs"
+		[ "$DISTRNAME" = "Debian" ] && ! version_more_version $DISTRVERSION 8 && BUILDREQ="$BUILDREQ ia32-libs" && ADDREQUIRES="$ADDREQUIRES ia32-libs"
+		[ "$DISTRNAME" = "AstraLinux" ] && BUILDREQ="$BUILDREQ ia32-libs-dev" && ADDREQUIRES="$ADDREQUIRES ia32-libs"
 		[ "$DISTRNAME" = "Ubuntu" ] && ! version_more_version $DISTRVERSION 12.04 && BUILDREQ="$BUILDREQ ia32-libs" && ADDREQUIRES="$ADDREQUIRES ia32-libs"
 		[ "$DISTRNAME" = "CentOS" ] && version_more_version $DISTRVERSION 6 && BUILDREQ="$BUILDREQ glibc-devel.i686"
 		[ "$DISTRNAME" = "Scientific" ] && version_more_version $DISTRVERSION 6 && BUILDREQ="$BUILDREQ glibc-devel.i686"
@@ -154,6 +150,12 @@ else
 		[ "$DISTRNAME" = "SUSE" ] && version_more_version $DISTRVERSION 11 && BUILDREQ="$BUILDREQ glibc-devel-32bit gcc-32bit"
 	fi
 
+	# hack against very straight patch command
+	FIXPATCHFUZZ="%define _default_patch_fuzz 3"
+	# see install in Korinf, need concatenate
+	BUILDREQ="$BUILDREQ make gcc\n$FIXPATCHFUZZ"
+	# (do not modify BUILDREQ anymore)
+
 	# Hack for allow repack on x86_64 packages with ExclusiveArch: %{ix586}
 	[ "$SYSARCH" = "x86_64" ] && subst "s|^ExclusiveArch:.*||g" $SPECNAME
 

bin/rpmgs

@@ -148,6 +148,7 @@ gear_update_from_tarball()
 	local TARBALL="$1"
 	local CURNAME="$2"
 	shift 2
+	assert_var TARBALL CURNAME
 	[ -d "$CURNAME" ] || CREATEFLAG=-c
 	# TODO: check tarball ext. for unsupported arch and realize it here or in gear-update
 	echo "Commit tarball '$TARBALL' to git subdir '$CURNAME'..."

share/eterbuild/functions/repl

@@ -35,7 +35,7 @@ add_32bit_requires()
 				rhas "$GREP" "-devel$" && ! rhas "$i" "(x86-32)$" && echo "$i $i(x86-32)" && continue
 				echo "$i"
 			done | xargs -n 1000 echo
-		elif [ "$DISTRNAME" = "Ubuntu" ] && version_more_version $DISTRVERSION 12.04 || [ "$DISTRNAME" = "Debian" ] && version_more_version $DISTRVERSION 7.0 ; then
+		elif [ "$DISTRNAME" = "Ubuntu" ] && version_more_version $DISTRVERSION 12.04 || [ "$DISTRNAME" = "Debian" ] && version_more_version $DISTRVERSION 7 ; then
 			# i386 on Debian/Ubuntu: # add :i386 to all -dev packages
 			for i in $* ; do
 				rhas "$GREP" "-devel$" && ! rhas "$i" ":i386$" && echo "$i $i:i386" && continue