spec: Drop %{extra_release}

It was mainly meant to be used for automatic builds through
Test::AutoBuild, so it can be removed now.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-05-07 16:40:31 +02:00 committed by Christophe Fergeau
parent ffdae4a98d
commit ba9c79b55e
3 changed files with 3 additions and 14 deletions

View File

@ -3,9 +3,7 @@
%define relver 1%{?dist}
# We want the 1st part of the release number, and
# the 3rd part (or 0 if not present). We want to
# avoid the autobuild magic 'extra_release' too
# which is not purely numeric and larger than 255.
# the 3rd part (or 0 if not present).
# This scheme lets us cope with RHEL-style z-stream
# versioning when creating Win product versions
%define rel0 %(echo %{relver} | cut -d. -f1)
@ -14,7 +12,7 @@
Name: mingw-virt-viewer
Version: @VERSION@
Release: %{relver}%{?extra_release}
Release: %{relver}
Summary: MinGW Windows virt-viewer console application
License: GPLv2+

View File

@ -32,17 +32,9 @@ test "$st" = 0
rm -f *.tar.gz
make dist
if [ -z "$RELEASE_BUILD" ]; then
NOW=`date +"%s"`
EXTRA_RELEASE=".$USER$NOW"
else
EXTRA_RELEASE=""
fi
if [ -f /usr/bin/rpmbuild ]; then
rpmbuild \
--define "extra_release $EXTRA_RELEASE" \
--define "_sourcedir `pwd`" \
-ba --clean virt-viewer.spec
fi
@ -81,7 +73,6 @@ fi
if test -x /usr/bin/i686-w64-mingw32-gcc && test -x /usr/bin/x86_64-w64-mingw32-gcc ; then
if [ -f /usr/bin/rpmbuild ]; then
rpmbuild \
--define "extra_release $EXTRA_RELEASE" \
--define "_sourcedir `pwd`" \
-ba --clean mingw-virt-viewer.spec
fi

View File

@ -17,7 +17,7 @@
Name: @PACKAGE@
Version: @VERSION@
Release: 1%{?dist}%{?extra_release}
Release: 1%{?dist}
Summary: Virtual Machine Viewer
Group: Applications/System
License: GPLv2+