Skip to content

E
etersoft-build-utils
Commit 3dc8770e authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmgs/rpmrb: fix default release

parent 459169ed
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
bin/rpmgs
View file @ 3dc8770e
...@@ -251,7 +251,6 @@ do ...@@ -251,7 +251,6 @@ do
CURVER=$(get_version $spec) CURVER=$(get_version $spec)
set_version $spec $GSSETVERSION set_version $spec $GSSETVERSION
if [ "$CURVER" != "$GSSETVERSION" ] ; then if [ "$CURVER" != "$GSSETVERSION" ] ; then
[ -n "$GSSETRELEASE" ] || GSSETRELEASE=$(get_default_txtrelease)1
set_release $spec $GSSETRELEASE set_release $spec $GSSETRELEASE
echo "Set new $GSSETVERSION-$GSSETRELEASE version for $spec" echo "Set new $GSSETVERSION-$GSSETRELEASE version for $spec"
else else
......
bin/rpmrb
View file @ 3dc8770e
...@@ -32,14 +32,14 @@ SPEC=$1 ...@@ -32,14 +32,14 @@ SPEC=$1
# allow run with spec file (obsoleted) # allow run with spec file (obsoleted)
[ -r "$SPEC" ] && shift [ -r "$SPEC" ] && shift
test -f "$SPEC" || SPEC=$(get_gear_spec)
VER=$1 VER=$1
# need for rpmgs # need for rpmgs
GSSETRELEASE=$2 GSSETRELEASE=$2
test -n "$GSSETRELEASE" || GSSETRELEASE=$(get_default_txtrelease)1 test -n "$GSSETRELEASE" || GSSETRELEASE=$(get_txtrelease $SPEC)1
export GSSETRELEASE export GSSETRELEASE
test -f "$SPEC" || SPEC=$(get_gear_spec)
docmd $ETERBUILDBIN/rpmgs $SPEC $VER || fatal "Error with get source" 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" add_changelog_helper "- new version $(get_version $SPEC) (with rpmrb script)" $SPEC || echog "Changelog entry already exists"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment