From: Nathan Cutler Date: Thu, 1 Mar 2018 17:32:01 +0000 (+0100) Subject: buildpackages: make-rpm.sh: update ceph.spec sed X-Git-Tag: 1.1.0~211^2~54 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eea2a2bc7e3580747c08712863bb50596996c2d8;p=teuthology.git buildpackages: make-rpm.sh: update ceph.spec sed Drop OBS-specific release suffix Signed-off-by: Nathan Cutler --- diff --git a/teuthology/task/buildpackages/make-rpm.sh b/teuthology/task/buildpackages/make-rpm.sh index 3e68d4438..8d0beaa00 100755 --- a/teuthology/task/buildpackages/make-rpm.sh +++ b/teuthology/task/buildpackages/make-rpm.sh @@ -145,11 +145,10 @@ function build_package() { ccache=$(echo /usr/lib*/ccache) # Build RPMs if [ "$suse" = true ]; then - sed -i -e '0,/%package/s//%debug_package\n&/' \ - -e 's/%{epoch}://g' \ - -e '/^Epoch:/d' \ - -e 's/%bcond_with ceph_test_package/%bcond_without ceph_test_package/' \ - -e "s/^Source0:.*$/Source0: $CEPH_TARBALL/" \ + 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/.//' \ -e '/^Source9/d' \ ceph.spec fi