Merge branch 'master' of git.eter:packages/etersoft-build-utils

bin/rpmbs

@@ -312,7 +312,7 @@ if [ -n "$TASKNUMBER" ] ; then
 else
 	echo "Create task for $TASKLIST"
 	[ -n "$VERBOSE" ] && echo "...with command ssh $GIRARHOST build -b $BINARYREPO $TASKLIST"
-	ssh $GIRARHOST build -b $BINARYREPO $TASKLIST 2&1 | tee $RPMDIR/uploaded.log.tmp
+	ssh $GIRARHOST build -b $BINARYREPO $TASKLIST 2>&1 | tee $RPMDIR/uploaded.log.tmp
 fi
 
 cat $RPMDIR/uploaded.log.tmp | head -n2 | tail -n1 >> $RPMDIR/uploaded.log

bin/rpmcs

@@ -99,6 +99,12 @@ do
 		fi
 	fi
 
+	# if there is no altlinux in changelog yet
+	if ! grep -v "Packager" $i | grep "@altlinux" ; then
+			echo "Add changelog with initial build"
+			add_changelog $i -e "- initial build for ALT Linux Sisyphus"
+	fi
+
 	echog "cleanup_spec for $i..."
 	cleanup_spec $i
 

bin/rpmgs

@@ -356,8 +356,8 @@ do
 		CURVER=$(get_version $i)
 		CURREL=$(get_release $i)
 		EGEARME=""
-		is_gear && EGEARME="import in git"
-		add_changelog_helper "- new version ($CURVER) $EGEARME" $i || echog "Changelog entry for $CURVER-$CURREL already exists"
+		is_gear && EGEARME=" import in git"
+		add_changelog_helper "- new version ($CURVER)$EGEARME" $i || echog "Changelog entry for $CURVER-$CURREL already exists"
 	fi
 
 	if [ -n "$GSSETVERSION" ] || [ -n "$FORCEDOWNLOAD" ]; then