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 <ncutler@suse.com>
(cherry picked from commit 6378fa45aca82261e534760cf32fadca0429da12)

Conflicts:
	ceph.spec.in
	install-deps.sh

diff --git a/ceph.spec.in b/ceph.spec.in
index bcf706d18ec691c815b900fbe1c709cf9a9173a9..323cf0bda89ba108c0be220a936f4c13bc04bb90 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -296,6 +296,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
 %endif
 %endif

diff --git a/install-deps.sh b/install-deps.sh
index 8f671db1450a4df695962684685af643d0d9f92e..5034b64a8080321f213938c5694cd2fb02f79e83 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -375,7 +375,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 $for_make_check $DIR/ceph.spec
         $SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1
         $SUDO $zypp_install libxmlsec1-1 libxmlsec1-nss1 libxmlsec1-openssl1 xmlsec1-devel xmlsec1-openssl-devel