Change in vdsm[master]: vdsm.spec: remove sed software_version/revision

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has uploaded a new change for review.

Change subject: vdsm.spec: remove sed software_version/revision
......................................................................

vdsm.spec: remove sed software_version/revision

VDSM should report the full version/revision.
Revert commit 23a0c7199371a8f6b767b8f49c87da11b466d7da

Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=893193
Signed-off-by: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
---
M vdsm.spec.in
M vdsm/dsaversion.py.in
2 files changed, 0 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/52/12952/1

diff --git a/vdsm.spec.in b/vdsm.spec.in
index ed71ab9..d5d2b16 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -450,11 +450,6 @@
 %endif
 %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}
diff --git a/vdsm/dsaversion.py.in b/vdsm/dsaversion.py.in
index d0160fc..a71953e 100644
--- a/vdsm/dsaversion.py.in
+++ b/vdsm/dsaversion.py.in
@@ -23,8 +23,6 @@
 python based components
 """
 version_name = "Snow Man"
-# FIXME: As soon as we can provide a long version/release to oVirt-Engine
-#        remove from vdsm.spec the sed to replace the below macros
 software_version = "@PACKAGE_VERSION@"
 software_revision = "@PACKAGE_RELEASE@"
 


--
To view, visit http://gerrit.ovirt.org/12952
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I44b6a28e378c4090595e823588dbbe583a38a353
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;