From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 29 Jan 2018 12:38:08 +0000 (+0100)
Subject: make-dist: don't set Release tag in ceph.spec for SUSE distros
X-Git-Tag: v18.1.0~525^2~1^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F48547%2Fhead;p=ceph.git

make-dist: don't set Release tag in ceph.spec for SUSE distros

SUSE's Open Build Service overwrites the Release tag with checkin
and build counters, so we can't use it to record the number of
commits since the last tag, and the last commit hash.  This commit
appends that extra information to the Version tag instead for
SUSE builds.

Fixes: https://tracker.ceph.com/issues/57893
Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/make-dist b/make-dist
index f2626871534b4..22bf2c98c003b 100755
--- a/make-dist
+++ b/make-dist
@@ -168,6 +168,19 @@ echo "including src/.git_version, ceph.spec"
 
 (git rev-parse HEAD ; echo $version) 2> /dev/null > src/.git_version
 
+if [ -r /etc/os-release ]; then
+    source /etc/os-release
+    case $ID in
+        opensuse*|suse|sles)
+            if [ "x$rpm_release" != "x0" ] ; then
+                rpm_release=$(echo $rpm_release | sed 's/.g/+g/')
+                rpm_version="${rpm_version}.${rpm_release}"
+                rpm_release="0"
+            fi
+            ;;
+    esac
+fi
+
 for spec in ceph.spec.in; do
     cat $spec |
         sed "s/@PROJECT_VERSION@/$rpm_version/g" |