From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 5 Sep 2016 13:07:53 +0000 (+0200)
Subject: buildpackages: use unadulterated make-dist
X-Git-Tag: v11.1.1~58^2^2~111^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29671063f9d2562c4e430ea12ce7e61ddf276f9e;p=ceph.git

buildpackages: use unadulterated make-dist

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

diff --git a/tasks/buildpackages/make-rpm.sh b/tasks/buildpackages/make-rpm.sh
index 27a2b5c965cd..f68a58d46171 100755
--- a/tasks/buildpackages/make-rpm.sh
+++ b/tasks/buildpackages/make-rpm.sh
@@ -101,16 +101,8 @@ function build_package() {
         #
         make dist-bzip2
     else
-        ##
-        # make-dist script suffixes the tarball with full version info,
-        # these transformations change version info to only include
-        # version number as is required by the ceph.spec file
-        #
-        cat make-dist \
-          | sed -e '0,/^outfile=/s//ver=`echo $version | cut -d - -f 1-1`\n&/' \
-          | sed -e 's/^\(outfile="ceph-$ver\)sion"/\1"/g' \
-                -e 's/\(--prefix ceph-$ver\)sion/\1/g' \
-          | sh
+        # kraken and above
+        ./make-dist
     fi
     # Set up build area
     setup_rpmmacros