From 5a2037929effaf9868a2f71b4affd7b7146f6c9c Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 29 Jan 2018 13:38:08 +0100 Subject: [PATCH] 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 Signed-off-by: Nathan Cutler (cherry picked from commit dfc9ef6886ae5de6b769979ebad46f5a81bcfaba) --- make-dist | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/make-dist b/make-dist index df1d88ae3e307..1abd2577ef2f4 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" | -- 2.47.3