build/ops: make "patch" build dependency explicit

This commit adds "patch" as an explicit build dependency. Before, the RPM
build was installing it in the build environment via some mechanism that I
don't entirely understand.

The "patch" command is used by the BuildBoost cmake module.

Fixes: http://tracker.ceph.com/issues/40175
Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index a29a07b5be8e81f6d42a4e9e7dd619d3ec21ebf3..295c11f041a8c0226e3aac387f3ad0f14bc126f7 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -177,6 +177,7 @@ BuildRequires:      libuuid-devel
 BuildRequires: make
 BuildRequires: ncurses-devel
 BuildRequires: parted
+BuildRequires: patch
 BuildRequires: perl
 BuildRequires: pkgconfig
 BuildRequires:  procps

diff --git a/debian/control b/debian/control
index 3b88fb27bc9869e192ff473ddc167738791ded76..81d606e3856fddd79e17065aa6a4b4910e560977 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -60,6 +60,7 @@ Build-Depends: cmake (>= 3.5),
                librabbitmq-dev,
                lsb-release,
                parted,
+               patch,
                pkg-config,
 # Crimson      protobuf-compiler,
                python (>= 2.7),