Merge pull request #2601 from ceph/wip-python-flask

debian: python-flask is needed by ceph, not python-ceph

Reviewed-by: Loic Dachary <loic@dachary.org>

ceph.spec.in

@@ -27,6 +27,7 @@ Requires:	python
 Requires:	python-argparse
 Requires:	python-ceph
 Requires:	python-requests
+Requires:	python-flask
 Requires:	xfsprogs
 Requires:	cryptsetup
 Requires:	parted
@@ -231,7 +232,6 @@ Group:		System Environment/Libraries
 License:	LGPL-2.0
 Requires:	librados2 = %{version}-%{release}
 Requires:	librbd1 = %{version}-%{release}
-Requires:	python-flask
 %if 0%{defined suse_version}
 %py_requires
 %endif
@@ -444,6 +444,7 @@ fi
 %{_bindir}/cephfs
 %{_bindir}/ceph-clsinfo
 %{_bindir}/ceph-rest-api
+%{python_sitelib}/ceph_rest_api.py*
 %{_bindir}/crushtool
 %{_bindir}/monmaptool
 %{_bindir}/osdmaptool
@@ -706,7 +707,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %{python_sitelib}/rbd.py*
 %{python_sitelib}/cephfs.py*
 %{python_sitelib}/ceph_argparse.py*
-%{python_sitelib}/ceph_rest_api.py*
 
 #################################################################################
 %files -n rest-bench

debian/ceph.install

@@ -11,6 +11,7 @@ usr/bin/ceph-mon
 usr/bin/ceph-osd
 usr/bin/ceph-run
 usr/bin/ceph-rest-api
+usr/lib/python*/dist-packages/ceph_rest_api.py
 usr/bin/ceph_mon_store_converter
 usr/bin/crushtool
 usr/bin/monmaptool

debian/control

@@ -60,6 +60,7 @@ Depends: binutils,
          sdparm | hdparm,
          uuid-runtime,
          xfsprogs,
+	 python-flask,
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: btrfs-tools, ceph-mds, librados2, libradosstriper1, librbd1
@@ -455,7 +456,7 @@ Description: Ceph test and benchmarking tools
 Package: python-ceph
 Architecture: linux-any
 Section: python
-Depends: librados2, librbd1, libcephfs1, python-flask, ${misc:Depends}, ${python:Depends}
+Depends: librados2, librbd1, libcephfs1, ${misc:Depends}, ${python:Depends}
 X-Python-Version: >= 2.6
 Description: Python libraries for the Ceph distributed filesystem
  Ceph is a massively scalable, open-source, distributed

debian/python-ceph.install

@@ -1 +1,4 @@
-usr/lib/python*
+usr/lib/python*/dist-packages/rados.py*
+usr/lib/python*/dist-packages/rbd.py*
+usr/lib/python*/dist-packages/cephfs.py*
+usr/lib/python*/dist-packages/ceph_argparse.py*