Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Some minor fixes to rpm/buildrpms.sh
  • Loading branch information
daniviga committed Jun 21, 2018
1 parent 4ddfd13 commit 6b7a7f1
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions rpm/buildrpms.sh
Expand Up @@ -43,6 +43,7 @@ then
mock_args="--old-chroot"
fi

relver=1
compile_spec_only=0
build_only=0
srpm_only=0
Expand Down Expand Up @@ -82,13 +83,14 @@ then
# Get next release version number and increment after
if [ ! -f version.cfg ]
then
echo "relver=1" > version.cfg
fi
source version.cfg
if [ "$build_only" -ne "1" ]
then
(( relver+=1 ))
echo "relver=$relver" > version.cfg
else
source version.cfg
if [ "$build_only" -ne "1" ]
then
(( relver+=1 ))
echo "relver=$relver" > version.cfg
fi
fi
timestamp=0
else
Expand Down Expand Up @@ -139,7 +141,7 @@ then
--define "_relver $relver" \
--define "_version $version" \
--define "_timestamp $timestamp" \
--resultdir=$OUTDIR $mock_args -ne 0;
--resultdir=$OUTDIR $mock_args
then
print_error "Creating source package failed"
exit 1
Expand Down Expand Up @@ -171,7 +173,7 @@ do :
--define "_relver $relver" \
--define "_version $version" \
--define "_timestamp $timestamp" \
--resultdir=$OUTDIR/$arch $mock_args -eq 0;
--resultdir=$OUTDIR/$arch $mock_args
then
# Add to package list
packages="$packages $(ls $OUTDIR/$arch/*-$version-$relver.*.rpm)"
Expand Down

0 comments on commit 6b7a7f1

Please sign in to comment.