add mark_file_to_remove for mark tmp. files and remove it if failed

share/eterbuild/functions/common

@@ -26,6 +26,9 @@ print_message()
 fatal()
 {
 	print_message Error "$@"
+	if [ -n "$ETERSOFT_FATAL_REMOVE_FILES" ]; then
+		rm -vf $ETERSOFT_FATAL_REMOVE_FILES
+	fi
 	exit 1
 }
 
@@ -35,6 +38,16 @@ warning()
 	print_message Warning "$@"
 }
 
+mark_file_to_remove()
+{
+	ETERSOFT_FATAL_REMOVE_FILES=$(estrlist union "$ETERSOFT_FATAL_REMOVE_FILES $@")
+}
+
+remove_file_from_remove()
+{
+	ETERSOFT_FATAL_REMOVE_FILES=$(estrlist exclude "$*" "$ETERSOFT_FATAL_REMOVE_FILES")
+}
+
 
 set_eterbuilddir()
 {

share/eterbuild/functions/spec

@@ -18,6 +18,7 @@ eval_spec()
 
 	# Drop changelog and make spec copy
 	# see http://bugs.etersoft.ru/show_bug.cgi?id=6588
+	mark_file_to_remove $SPECNAME.tmp $SPECNAME.changelog
 	separate_changelog $SPECNAME $SPECNAME.tmp $SPECNAME.changelog
 	SPEC=$SPECNAME.tmp
 
@@ -38,6 +39,7 @@ eval_spec()
 		$USEARCH $RPMBUILD -bE --target $SYSARCH $RPMBUILDARG $SPEC 2>/dev/null || cat $SPEC
 	fi
 	rm -f $SPECNAME.tmp $SPECNAME.changelog
+	remove_file_from_remove $SPECNAME.tmp $SPECNAME.changelog
 }
 
 get_release()