From: Alfredo Deza Date: Mon, 12 Sep 2016 12:13:27 +0000 (+0530) Subject: ceph-dev-build: further massage ceph.spec to insist on using sha1 in version name X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F473%2Fhead;p=ceph-build.git ceph-dev-build: further massage ceph.spec to insist on using sha1 in version name Signed-off-by: Alfredo Deza --- diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm index 3b890734..9c19708d 100644 --- a/ceph-dev-build/build/build_rpm +++ b/ceph-dev-build/build/build_rpm @@ -104,6 +104,10 @@ cd $releasedir/$cephver || exit 1 sed -i "s/^%setup.*/%setup -q -n %{name}-$vers/" ceph.spec # it is entirely possible that `%setup` is not even used, but rather, autosetup sed -i "s/^%autosetup.*/%autosetup -p1 -n %{name}-$vers/" ceph.spec +# This is a fallback to the spec rules that may have altered sections that want +# to force a non-sha1 naming. This is only needed in development binary +# building. +sed -i "s/%{name}-%{version}/ceph-$vers/" ceph.spec # This is needed because the 'version' this job gets from upstream contains chars # that are not legal for an RPM file. These are already converted in the spec file whic