[gtk-vnc] build: drop extra release tag from RPM specs



commit 5e66b9991faecc6cc2fc7fdb95f53d6afbefc86d
Author: Daniel P. Berrangé <berrange redhat com>
Date:   Mon Aug 5 16:52:54 2019 +0100

    build: drop extra release tag from RPM specs
    
    Signed-off-by: Daniel P. Berrangé <berrange redhat com>

 gtk-vnc.spec.in                    | 2 +-
 mingw-gtk-vnc.spec.in              | 2 +-
 autobuild.sh => prepare-release.sh | 9 ---------
 3 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/gtk-vnc.spec.in b/gtk-vnc.spec.in
index e8fb254..2ee5078 100644
--- a/gtk-vnc.spec.in
+++ b/gtk-vnc.spec.in
@@ -12,7 +12,7 @@
 Summary: A GTK widget for VNC clients
 Name: gtk-vnc
 Version: @VERSION@
-Release: 1%{?dist}%{?extra_release}
+Release: 1%{?dist}
 License: LGPLv2+
 Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.xz
 URL: https://wiki.gnome.org/Projects/gtk-vnc
diff --git a/mingw-gtk-vnc.spec.in b/mingw-gtk-vnc.spec.in
index 3e736ad..11988a7 100644
--- a/mingw-gtk-vnc.spec.in
+++ b/mingw-gtk-vnc.spec.in
@@ -2,7 +2,7 @@
 
 Name: mingw-gtk-vnc
 Version: @VERSION@
-Release: 1%{?dist}%{?extra_release}
+Release: 1%{?dist}
 Summary: MinGW Windows port of VNC client GTK widget
 
 License: LGPLv2+
diff --git a/autobuild.sh b/prepare-release.sh
similarity index 89%
rename from autobuild.sh
rename to prepare-release.sh
index 361bdf0..3868480 100755
--- a/autobuild.sh
+++ b/prepare-release.sh
@@ -31,16 +31,8 @@ test "$st" = 0
 rm -f *.tar.gz
 make dist
 
-if [ -n "$AUTOBUILD_COUNTER" ]; then
-  EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER"
-else
-  NOW=`date +"%s"`
-  EXTRA_RELEASE=".$USER$NOW"
-fi
-
 if [ -f /usr/bin/rpmbuild ]; then
   rpmbuild --nodeps \
-     --define "extra_release $EXTRA_RELEASE" \
      --define "_sourcedir `pwd`" \
      -ba --clean gtk-vnc.spec
 fi
@@ -85,7 +77,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 --nodeps \
-       --define "extra_release $EXTRA_RELEASE" \
        --define "_sourcedir `pwd`" \
        -ba --clean mingw-gtk-vnc.spec
   fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]