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>
(cherry picked from commit fe632e2d886791e2168ee6200b5bf1bfe8c88d0e)

diff --git a/ceph.spec.in b/ceph.spec.in
index 8c01cd28861fb018d844c3ff405d4d86c3653f56..ee82e9cb01b2ec79f13388d7ed7be4651a32fb32 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -161,6 +161,7 @@ BuildRequires:      libxml2-devel
 BuildRequires: libuuid-devel
 BuildRequires: make
 BuildRequires: parted
+BuildRequires: patch
 BuildRequires: perl
 BuildRequires: pkgconfig
 BuildRequires:  procps

diff --git a/debian/control b/debian/control
index 4be8197b36d83e8ae507e5bf2ff46c6075d10e77..56df3057f90b6c35cfca2c40d8ec23437126b7cf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -49,6 +49,7 @@ Build-Depends: bc,
                libxml2-dev,
                lsb-release,
                parted,
+               patch,
                pkg-config,
                python (>= 2.7),
                python-all-dev,