[vdsm/f17] bz822158 report version-release in a short format

[Federico Simoncelli]

commit b7c41bfa77ffb84730f4c1c9f129746a5ee5e92d
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Mon Jun 4 14:37:41 2012 +0200

    bz822158 report version-release in a short format

 vdsm.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/vdsm.spec b/vdsm.spec
index 0734cde..8ab82b2 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -20,7 +20,7 @@
 
 Name:           %{vdsm_name}
 Version:        4.9.6
-Release:        1%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Release:        2%{?vdsm_relvtag}%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -327,6 +327,11 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 %build
 %configure %{?with_hooks:--enable-hooks}
 make
+# Setting software_version and software_revision in dsaversion.py
+baserelease=`echo "%{release}" | sed 's/\([0-9]\+\(\.[0-9]\+\)\?\).*/\1/'`
+baseversion=`echo "%{version}" | sed 's/\([0-9]\+\(\.[0-9]\+\)\?\).*/\1/'`
+sed -i -e 's/^software_version =.*/software_version = "'"${baseversion}"'"/' \
+       -e 's/^software_revision =.*/software_revision = "'"${baserelease}"'"/' vdsm/dsaversion.py
 
 %install
 rm -rf %{buildroot}
@@ -859,6 +864,9 @@ exit 0
 %{_datadir}/%{vdsm_name}/gluster/hostname.py*
 
 %changelog
+* Mon Jun  4 2012 Federico Simoncelli <fsimonce at redhat.com> 4.9.6-2.gite952471.fc17
+- BZ#822158 Report version-release in a short format
+
 * Mon Jun  4 2012 Federico Simoncelli <fsimonce at redhat.com> 4.9.6-1.gite952471.fc17
 - vdsm-4.9.6-ge952471