From: Nathan Cutler Date: Fri, 6 Apr 2018 09:50:22 +0000 (+0200) Subject: ceph.spec.in: remove hard versioned dependency of ceph-test on ceph-common X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=308b536e66c1e8dc3da2def7a7f36bb2d2d1e3b9;p=ceph.git ceph.spec.in: remove hard versioned dependency of ceph-test on ceph-common OBS builds the ceph-test RPM separately from the normal Ceph RPMs, and ceph-test is shipped on the Internal Media. I also found that OBS has no problem producing ceph-test RPM with a slightly different version number than the Ceph RPMs, with the result that it cannot be installed due to this hard versioned dependency in the spec file. Upstream doesn't have this problem because they always build ceph-test along with the other RPMs. We don't really need the hard versioned dependency. It's convenient to have, but not absolutely necessary. I would rather add version sanity-checking code to the test cases that use the ceph-test RPM, than to have all test cases fail because ceph-test cannot be installed. Signed-off-by: Nathan Cutler --- diff --git a/ceph.spec.in b/ceph.spec.in index a6dfad92869..3b78c5d3ab5 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1094,7 +1094,7 @@ Summary: Ceph benchmarks and test tools %if 0%{?suse_version} Group: System/Benchmark %endif -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-common Requires: xmlstarlet Requires: jq Requires: socat