From: Ken Dreyer <kdreyer@redhat.com>
Date: Thu, 9 Jul 2015 19:40:23 +0000 (-0600)
Subject: Merge pull request #5076 from SUSE/wip-logrotate-hard-dependency
X-Git-Tag: v9.0.3~64
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a6d82d92a96cc5d617dc81604d67f1d9b9048c5;p=ceph.git

Merge pull request #5076 from SUSE/wip-logrotate-hard-dependency

packaging: make logrotate a hard dependency across all distros

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

 Conflicts:
	debian/control
---

6a6d82d92a96cc5d617dc81604d67f1d9b9048c5
diff --cc ceph.spec.in
index a7bb6ec6d1d8,8aee30583055..a6400ea51979
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@@ -43,9 -41,11 +43,10 @@@ Requires:	python-rados = %{epoch}:%{ver
  Requires:	python-rbd = %{epoch}:%{version}-%{release}
  Requires:	python-cephfs = %{epoch}:%{version}-%{release}
  Requires:	python
 -Requires:	python-argparse
  Requires:	python-requests
 -Requires:	python-flask
 +Requires:	grep
  Requires:	xfsprogs
+ Requires:	logrotate
  Requires:	parted
  Requires:	util-linux
  Requires:	hdparm
diff --cc debian/control
index 6801a4541a86,7d88d5d7dddd..ef018e066639
--- a/debian/control
+++ b/debian/control
@@@ -64,7 -64,7 +64,8 @@@ Depends: binutils
           ceph-common (>= 9.0.0-943),
           cryptsetup-bin | cryptsetup,
           gdisk,
 +         grep,
+          logrotate,
           parted,
           python,
           python-argparse,