rpmgs/rpmrb: fix default release

bin/rpmgs

@@ -251,7 +251,6 @@ do
 		CURVER=$(get_version $spec)
 		set_version $spec $GSSETVERSION
 		if [ "$CURVER" != "$GSSETVERSION" ] ; then
-			[ -n "$GSSETRELEASE" ] || GSSETRELEASE=$(get_default_txtrelease)1
 			set_release $spec $GSSETRELEASE
 			echo "Set new $GSSETVERSION-$GSSETRELEASE version for $spec"
 		else

bin/rpmrb

@@ -32,14 +32,14 @@ SPEC=$1
 # allow run with spec file (obsoleted)
 [ -r "$SPEC" ] && shift
 
+test -f "$SPEC" || SPEC=$(get_gear_spec)
+
 VER=$1
 # need for rpmgs
 GSSETRELEASE=$2
-test -n "$GSSETRELEASE" || GSSETRELEASE=$(get_default_txtrelease)1
+test -n "$GSSETRELEASE" || GSSETRELEASE=$(get_txtrelease $SPEC)1
 export GSSETRELEASE
 
-test -f "$SPEC" || SPEC=$(get_gear_spec)
-
 docmd $ETERBUILDBIN/rpmgs $SPEC $VER || fatal "Error with get source"
 add_changelog_helper "- new version $(get_version $SPEC) (with rpmrb script)" $SPEC || echog "Changelog entry already exists"