[virt-tools-list] [virt-viewer PATCH v2 3/3] spec: Drop %{extra_release}

[Andrea Bolognani]

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 at redhat.com>
---
 mingw-virt-viewer.spec.in | 6 ++----
 prepare-release.sh        | 9 ---------
 virt-viewer.spec.in       | 2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/mingw-virt-viewer.spec.in b/mingw-virt-viewer.spec.in
index ddea296..b15e1f3 100644
--- a/mingw-virt-viewer.spec.in
+++ b/mingw-virt-viewer.spec.in
@@ -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+
diff --git a/prepare-release.sh b/prepare-release.sh
index 432fb25..c2fbfdb 100755
--- a/prepare-release.sh
+++ b/prepare-release.sh
@@ -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
diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
index f3661d2..ba786e7 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -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+
-- 
2.17.0