From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 26 Jul 2017 15:58:10 +0000 (-0400)
Subject: ceph-iscsi-config: corrected sed replacements
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F796%2Fhead;p=ceph-build.git

ceph-iscsi-config: corrected sed replacements

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/ceph-iscsi-config/build/build_rpm b/ceph-iscsi-config/build/build_rpm
index ec293e1a..fa65192e 100644
--- a/ceph-iscsi-config/build/build_rpm
+++ b/ceph-iscsi-config/build/build_rpm
@@ -19,12 +19,13 @@ VERSION="$(git describe --abbrev=0 --tags HEAD)"
 REVISION="$(git describe --tags HEAD | cut -d - -f 2- | sed 's/-/./')"
 
 # Update spec version
-sed -i "s/^Version:.*$/Version:\t${VERSION}-${REVISION}/g" $WORKSPACE/ceph-iscsi-config.spec
+sed -i "s/^Version:.*$/Version:\t${VERSION}/g" $WORKSPACE/ceph-iscsi-config.spec
+sed -i "s/^Release:.*$/Release:\t${REVISION}%{?dist}/g" $WORKSPACE/ceph-iscsi-config.spec
 # for debugging
 cat $WORKSPACE/ceph-iscsi-config.spec
 
 # Update setup.py version
-sed -i "s/version=""[^""]*""/version=""${VERSION}""/g" $WORKSPACE/setup.py
+sed -i "s/version=\"[^\"]*\"/version=\"${VERSION}\"/g" $WORKSPACE/setup.py
 # for debugging
 cat $WORKSPACE/setup.py