From 6378fa45aca82261e534760cf32fadca0429da12 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 6 Dec 2019 15:29:30 +0100 Subject: [PATCH] rpm: add rpm-build to SUSE-specific make check deps The binary /usr/bin/rpmspec was recently moved to rpm-build, breaking install-deps.sh on openSUSE Tumbleweed. The package is not strictly needed for SLE-15-SP* and openSUSE Leap 15.*, but it doesn't hurt to have it, and will future-proof these distros from this regression. Putting the dependency in the spec file does not address the issue, because /usr/bin/rpmspec must be available before install-deps.sh runs it to determine the dependencies, but it's nice to have it explicitly listed there, since it *is* a dependency of "make check" on SUSE distros. SUSE versions < 15 are of no interest in master/octopus+. Fixes: https://tracker.ceph.com/issues/42612 Signed-off-by: Nathan Cutler --- ceph.spec.in | 1 + install-deps.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index 3d936148823..1adb2d77108 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -313,6 +313,7 @@ BuildRequires: python%{_python_buildid}-PyJWT BuildRequires: python%{_python_buildid}-Routes BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-numpy-devel +BuildRequires: rpm-build BuildRequires: xmlsec1-devel BuildRequires: xmlsec1-openssl-devel %endif diff --git a/install-deps.sh b/install-deps.sh index 621739a4a77..36c3ebf1b2b 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -424,7 +424,7 @@ else opensuse*|suse|sles) echo "Using zypper to install dependencies" zypp_install="zypper --gpg-auto-import-keys --non-interactive install --no-recommends" - $SUDO $zypp_install systemd-rpm-macros + $SUDO $zypp_install systemd-rpm-macros rpm-build || exit 1 munge_ceph_spec_in $with_seastar $for_make_check $DIR/ceph.spec $SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1 ;; -- 2.39.5