buildpackages: ensure ceph.spec has correct Version and Release

In the buildpackages task we don't care what the spec file thinks the Version
and Release should be. We force it to be what we need.

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

diff --git a/teuthology/task/buildpackages/make-rpm.sh b/teuthology/task/buildpackages/make-rpm.sh
index d2686a2814badc19944db9bb017e8a73037d4b84..7588aa8bfb41255147184f700f6a9d401c248ae4 100755 (executable)
--- a/teuthology/task/buildpackages/make-rpm.sh
+++ b/teuthology/task/buildpackages/make-rpm.sh
@@ -135,6 +135,8 @@ function build_package() {
     mkdir -p ${buildarea}/BUILD
     CEPH_TARBALL=( ceph-*.tar.bz2 )
     CEPH_TARBALL_BASE=$(echo $CEPH_TARBALL | sed -e 's/.tar.bz2$//')
+    CEPH_VERSION=$(echo $CEPH_TARBALL_BASE | cut -d - -f 2-2)
+    CEPH_RELEASE=$(echo $CEPH_TARBALL_BASE | cut -d - -f 3- | tr - .)
     cp -a $CEPH_TARBALL ${buildarea}/SOURCES/.
     cp -a rpm/*.patch ${buildarea}/SOURCES || true
     (
@@ -144,9 +146,10 @@ function build_package() {
           sed -i \
                  -e '0,/%package/s//%debug_package\n\n&/' \
                  -e 's/%bcond_with ceph_test_package/%bcond_without ceph_test_package/g' \
-                 -e '0,/^Release:/s/.<B_CNT>//' \
+                 -e "s/^Version:.*/Version: $CEPH_VERSION/g" \
+                 -e "s/^Release:.*/Release: $CEPH_RELEASE/g" \
+                 -e "s/^Source0:.*/Source0: $CEPH_TARBALL/g" \
                  -e '/^Source9/d' \
-                 -e "0,/^Source0:/s/Source0:.*/Source0: $CEPH_TARBALL/" \
                  -e "s/^%autosetup -p1.*/%autosetup -p1 -n $CEPH_TARBALL_BASE/g" \
                  ceph.spec
         fi