ceph.spec, debian: Add python-common to ceph-common

Co-authored-by: Tim Serong <tserong@suse.com>
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 85e5b0a4047a5397fe0a53585bdef9b522140503..149ba8d88a60018f39d6f83cfc067adc4a1ccb87 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -385,6 +385,7 @@ Requires:   python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release}
 Requires:      python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release}
 Requires:      python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release}
 Requires:      python%{_python_buildid}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
+Requires:      python%{_python_buildid}-ceph-common = %{_epoch_prefix}%{version}-%{release}
 Requires:      python%{_python_buildid}-requests
 %if 0%{?fedora} || 0%{?rhel}
 Requires:      python%{_python_buildid}-prettytable
@@ -963,6 +964,27 @@ well as the RESTful interface. These have to do with querying the daemons for
 command-description information, validating user command input against those
 descriptions, and submitting the command to the appropriate daemon.
 
+%if 0%{with python2}
+%package -n python-ceph-common
+Summary:       Python 2 utility libraries for Ceph
+%if 0%{?suse_version}
+Group:         Development/Libraries/Python
+%endif
+%description -n python-ceph-common
+This package contains data structures, classes and functions used by Ceph.
+It also contains utilities used for the SSH orchestrator.
+%endif
+
+%package -n python%{python3_pkgversion}-ceph-common
+Summary:       Python 3 utility libraries for Ceph
+%if 0%{?suse_version}
+Group:         Development/Libraries/Python
+%endif
+Provides:   python3-ceph-common = %{_epoch_prefix}%{version}-%{release}
+%description -n python%{python3_pkgversion}-ceph-common
+This package contains data structures, classes and functions used by Ceph.
+It also contains utilities used for the SSH orchestrator.
+
 %if 0%{with cephfs_shell}
 %package -n cephfs-shell
 Summary:    Interactive shell for Ceph file system
@@ -2135,6 +2157,16 @@ fi
 %{python3_sitelib}/ceph_daemon.py
 %{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py*
 
+%if 0%{with python2}
+%files -n python-ceph-common
+%{python_sitelib}/ceph
+%{python_sitelib}/ceph-*.egg-info
+%endif
+
+%files -n python%{python3_pkgversion}-ceph-common
+%{python3_sitelib}/ceph
+%{python3_sitelib}/ceph-*.egg-info
+
 %if 0%{with cephfs_shell}
 %files -n cephfs-shell
 %{python3_sitelib}/cephfs_shell-*.egg-info

diff --git a/debian/control b/debian/control
index 84b1bcb12e8b1dd32bb7d1d57cda7082df2335c2..a9a35b2cd72d1a44dba315484123aa6e63d61a51 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -528,6 +528,7 @@ Architecture: linux-any
 Depends: librbd1 (= ${binary:Version}),
          python-cephfs (= ${binary:Version}),
          python-ceph-argparse (= ${binary:Version}),
+         python-ceph-common (= ${binary:Version}),
          python-prettytable,
          python-rados (= ${binary:Version}),
          python-rbd (= ${binary:Version}),
@@ -1200,6 +1201,32 @@ Description: Python 3 utility libraries for Ceph CLI
  This package contains types and routines for Python 3 used by the
  Ceph CLI as well as the RESTful interface.
 
+Package: python-ceph-common
+Architecture: all
+Section: python
+Depends: ${misc:Depends},
+         ${python:Depends},
+Description: Python 2 utility libraries for Ceph
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains data structures, classes and functions used by Ceph.
+ It also contains utilities used for the SSH orchestrator.
+
+Package: python3-ceph-common
+Architecture: all
+Section: python
+Depends: ${misc:Depends},
+         ${python3:Depends},
+Description: Python 3 utility libraries for Ceph
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains data structures, classes and functions used by Ceph.
+ It also contains utilities used for the SSH orchestrator.
+
 Package: libcephfs-java
 Section: java
 Architecture: all

diff --git a/debian/python-ceph-common.install b/debian/python-ceph-common.install
new file mode 100644 (file)
index 0000000..4165b78
--- /dev/null
+++ b/debian/python-ceph-common.install
@@ -0,0 +1,2 @@
+usr/lib/python2*/dist-packages/ceph-*.egg-info
+usr/lib/python2*/dist-packages/ceph

diff --git a/debian/python3-ceph-common.install b/debian/python3-ceph-common.install
new file mode 100644 (file)
index 0000000..a9b47e3
--- /dev/null
+++ b/debian/python3-ceph-common.install
@@ -0,0 +1,2 @@
+usr/lib/python3*/dist-packages/ceph-*.egg-info
+usr/lib/python3*/dist-packages/ceph

diff --git a/debian/rules b/debian/rules
index a6456d692b320b2b8c084ebf540e062c910acecd..9cd797930e1f64eaecf4ecd811305135ed71885a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -138,6 +138,7 @@ override_dh_python3:
          dh_python3 -p python3-$$binding;      \
        done
        dh_python3 -p python3-ceph-argparse
+       dh_python3 -p python3-ceph-common
        dh_python3 -p cephfs-shell
 
 # do not run tests