From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 29 Jan 2018 12:38:08 +0000 (+0100)
Subject: make-dist: respect Factory rules downstream
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e349697f98be251cf4d1f049756a27f97df71dde;p=ceph.git

make-dist: respect Factory rules downstream

In Tumbleweed and SLE, it is not allowed to use <B_CI> and <B_CNT>. The
Release field must be populated exclusively by the OBS.

Use "opensuse*" to support Tumbleweed and newer versions of Leap.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Conflicts:
	make-dist
---

diff --git a/make-dist b/make-dist
index 75528c1b860..d2492b6aeb5 100755
--- a/make-dist
+++ b/make-dist
@@ -168,6 +168,17 @@ echo "including src/.git_version, ceph.spec"
 
 (git rev-parse HEAD ; echo $version) 2> /dev/null > src/.git_version
 
+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
+
 for spec in ceph.spec.in; do
     cat $spec |
         sed "s/@PROJECT_VERSION@/$rpm_version/g" |