From 3d5dabf81171b0d86773b78ccc1f3eaa4b9d1526 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 26 Jan 2018 23:20:51 +0100 Subject: [PATCH] build/ops: rpm: Python 3-only ceph-disk and ceph-volume This should have been part of 661ccdbaa15f88d69986533c74553e6a19bd577d but was overlooked. Signed-off-by: Nathan Cutler --- ceph.spec.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index 50ae588d656..f1c9e8c6b4b 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -1035,11 +1035,22 @@ rm -rf %{buildroot} %endif %{_unitdir}/ceph-disk@.service %{_unitdir}/ceph.target +%if 0%{with python2} %{python_sitelib}/ceph_detect_init* %{python_sitelib}/ceph_disk* +%else +%{python3_sitelib}/ceph_detect_init* +%{python3_sitelib}/ceph_disk* +%endif +%if 0%{with python2} %dir %{python_sitelib}/ceph_volume %{python_sitelib}/ceph_volume/* %{python_sitelib}/ceph_volume-* +%else +%dir %{python3_sitelib}/ceph_volume +%{python3_sitelib}/ceph_volume/* +%{python3_sitelib}/ceph_volume-* +%endif %{_mandir}/man8/ceph-deploy.8* %{_mandir}/man8/ceph-detect-init.8* %{_mandir}/man8/ceph-create-keys.8* -- 2.39.5