small cleanup

bin/gitcam

 #!/bin/sh
-# Do commit amend for all files
+# Do commit --amend for all files in the repo
 
 # load common functions, compatible with local and installed script
 . `dirname $0`/../share/eterbuild/functions/common

bin/rpmlog

@@ -73,6 +73,7 @@ if [ -z "$FROMTAG" ] ; then
 	[ -n "$VERSION" ] || fatal "Can't get package version"
 	[ -n "$RELEASE" ] || fatal "Can't get package release"
 	FROMTAG="$VERSION-$RELEASE"
+	# FIXME: if don't exists, use last tag?
 fi
 
 # TODO: найти параметр для упрощения истории. пока - sort?
@@ -85,14 +86,20 @@ if [ -n "$TESTRUN" ] ; then
 fi
 
 # increment release
-if [ "$INCREMENTMODE" = "-r" ] ; then
+case "$INCREMENTMODE" in
+        "-r")
                 inc_release $SPECNAME
-elif [ "$INCREMENTMODE" = "-s" ] ; then
+                ;;
+        "-s")
                 inc_subrelease $SPECNAME
-elif [ "$INCREMENTMODE" = "-v" ] ; then
+                ;;
+        "-v")
                 set_release $SPECNAME
                 inc_version $SPECNAME
-fi
+                ;;
+        *)
+                fatal "unknown increment mode $INCREMENTMODE"
+esac
 
 NEWREV=$(get_version $SPECNAME)-$(get_release $SPECNAME)
 echo "Add changelog to $NEWREV:"

share/eterbuild/functions/build

@@ -10,7 +10,7 @@ get_gear_rules()
 	# FIXME: move get rules file to separate function
 	local BASESPECNAME=$(basename "$SPECNAME")
 	local ALTGEARRULESFILE=.gear/rules-${BASESPECNAME/.spec/}
-	local ALTGEARRULES=$(git rev-parse --git-dir)/../$ALTGEARRULESFILE
+	local ALTGEARRULES=$(get_root_git_dir)/$ALTGEARRULESFILE
 	local GEARRULES=
 	if [ -r "$ALTGEARRULES" ] ; then
 		#echo "Build with alternate rules $ALTGEARRULESFILE"

share/eterbuild/functions/hasher

@@ -73,7 +73,7 @@ print_tmp_sourceslist()
 		cat "$SLIST" | sed -e "s|i[56]86|$BUILDARCH|g"
 	else
 		# Note: drop biarch 32bit on real 32bit
-		cat "$SLIST" | sed -e "s|x86_64|$BUILDARCH|g" | grep -v "x86_32"
+		cat "$SLIST" | sed -e "s|x86_64|$BUILDARCH|g" | grep -v "x86_32" | grep -v "x86-i586"
 	fi
 }