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 734542815756d37bcb995ba55bdfd8716cbeb4f2..66dfe2686a9885b052943a514ed0d1f38003cac2 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -174,6 +174,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 b073073ba137eed5f50bc4fff490fec510c664d7..d821770143bc8f0b3db85a7c0fb5a0d0c0a2d4ae 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -49,6 +49,7 @@ Build-Depends: cmake (>= 3.5),
                librabbitmq-dev,
                lsb-release,
                parted,
+               patch,
                pkg-config,
                python (>= 2.7),
                python-all-dev,