]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #5076 from SUSE/wip-logrotate-hard-dependency
authorKen Dreyer <kdreyer@redhat.com>
Thu, 9 Jul 2015 19:40:23 +0000 (13:40 -0600)
committerKen Dreyer <kdreyer@redhat.com>
Thu, 9 Jul 2015 19:40:23 +0000 (13:40 -0600)
packaging: make logrotate a hard dependency across all distros

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
 Conflicts:
debian/control

1  2 
ceph.spec.in
debian/control

diff --cc ceph.spec.in
index a7bb6ec6d1d80be4653396197aacaeca2de65211,8aee30583055e9933c486ad42c7e81133f0e8783..a6400ea5197935c695c746da66b9b81aa6681079
@@@ -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 6801a4541a86b5fa4afdd71e786d060151d5ec61,7d88d5d7dddd53303eebef5c00074d6e0be74c41..ef018e066639ac9020185e922aeee9a86b4d8bab
@@@ -64,7 -64,7 +64,8 @@@ Depends: binutils
           ceph-common (>= 9.0.0-943),
           cryptsetup-bin | cryptsetup,
           gdisk,
 +         grep,
+          logrotate,
           parted,
           python,
           python-argparse,