From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 9 Mar 2018 00:42:02 +0000 (+0100)
Subject: Revert "make-dist: add OBS-specific release suffix on SUSE"
X-Git-Tag: v13.0.2~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=382d8b3a16ba2fc993452ef9f35b41326d591cdb;p=ceph.git

Revert "make-dist: add OBS-specific release suffix on SUSE"

This reverts commit ca6c92b3ec2f715cf247e9c1009d315d9de9c55a.

The OBS-specific suffix potentially causes trouble when building outside of
OBS. Also, the OBS build process already includes a spec-file munging step
where this can be done.

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

diff --git a/make-dist b/make-dist
index 2ac4c93762b8..e492fae93e0f 100755
--- a/make-dist
+++ b/make-dist
@@ -105,14 +105,6 @@ for spec in ceph.spec.in alpine/APKBUILD.in; do
         sed "s/@RPM_RELEASE@/$rpm_release/g" |
         sed "s/@TARBALL_BASENAME@/ceph-$version/g" > `echo $spec | sed 's/.in$//'`
 done
-
-. /etc/os-release
-case $ID in
-    opensuse|suse|sles)
-        sed -i -e "s/^Release:.*/&.<B_CNT>/" ceph.spec
-        ;;
-esac
-
 ln -s . $outfile
 tar cvf $outfile.version.tar $outfile/src/.git_version $outfile/ceph.spec $outfile/alpine/APKBUILD
 # NOTE: If you change this version number make sure the package is available