From: Joao Eduardo Luis <joao@clyso.com>
Date: Sun, 21 Jul 2024 08:15:11 +0000 (+0000)
Subject: make-dist: replace all '-' for '.' for rpm release
X-Git-Tag: v20.0.0~898^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=14318e4210a93edef7c45faf60dfc2f6a0741db5;p=ceph.git

make-dist: replace all '-' for '.' for rpm release

Otherwise, a version like 'vX.Y.Z-foo-bar-baz' would end up as an rpm
release of 'foo.bar-baz' in the spec file, and rpm will not like that
very much because of that extra '-'.

Signed-off-by: Joao Eduardo Luis <joao@clyso.com>
---

diff --git a/make-dist b/make-dist
index e874436a5e707..033bedebd87f0 100755
--- a/make-dist
+++ b/make-dist
@@ -23,7 +23,7 @@ version=$1
 [ -z "$version" ] && version=$(git describe --long --match 'v*' | sed 's/^v//')
 if expr index $version '-' > /dev/null; then
     rpm_version=$(echo $version | cut -d - -f 1-1)
-    rpm_release=$(echo $version | cut -d - -f 2- | sed 's/-/./')
+    rpm_release=$(echo $version | cut -d - -f 2- | sed 's/-/./g')
 else
     rpm_version=$version
     rpm_release=0