SPEC file cleanup

* Removed the hard coded snap tag, if needed it should be passed in
  via "rpmbuild --define 'snap ...'".
* Changed the hard coded version to "@VERSION@" to make it clear
  that the copy of the spec file in the repository needs to be
  updated manually.

(cherry picked from commit 70c2351d54135bad5fa671c39f01ea8955490daa)

diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index d20be535043515f7dd8abf9ce5c4c0475be6fd2f..1b88670d16c6cebda152aa5d6cba60bef5b62693 100644 (file)
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -1,9 +1,8 @@
 %define _default_patch_fuzz 2
-%define snap 20141119git59c5a55c
 %define mesa_version 7.7.1
 
 Name: tigervnc
-Version: 1.3.80
+Version: @VERSION@
 Release: 18%{?snap:.%{snap}}%{?dist}
 Summary: A TigerVNC remote display system
 

diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index 5e8bc59907921a57a1f20444f5e45a4015ac13f0..da8ce73fc8ef1beb29ed8266d61272c4c43dabde 100644 (file)
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -1,7 +1,5 @@
-%define                snap 20131128svn5139
-
 Name: tigervnc
-Version: 1.3.80
+Version: @VERSION@
 Release: 18%{?snap:.%{snap}}%{?dist}
 Summary: A TigerVNC remote display system
 

diff --git a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
index ce2f5421b49bf49e0dc399ce5662babbc1042fb4..fd91cdb773875205f20f7369ab185730a8c1b430 100644 (file)
--- a/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/sle11/SPECS/tigervnc.spec
@@ -14,12 +14,11 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-%define         snap 20131202svn5145
 %define         debug_package %{nil}
 
 
 Name:           tigervnc
-Version:        1.3.80
+Version:        @VERSION@
 Release:        1%{?snap:.%{snap}}%{?dist}
 Packager:       Brian P. Hinz <bphinz@users.sourceforge.net>
 License:        GPL-2.0 and MIT