From c31190dc0c19fdba22e6d9973c8bac19faa3e838 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Jun 08 2020 16:12:27 +0000 Subject: ceph 14.2.9 GA --- diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index d9a2466..d54d62c 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -27,7 +27,7 @@ %global _hardened_build 1 %bcond_with make_check -%bcond_without ceph_test_package +%bcond_with ceph_test_package %ifarch s390 s390x %bcond_with tcmalloc %else @@ -154,7 +154,7 @@ BuildRequires: fuse-devel %if 0%{?rhel} == 7 # devtoolset offers newer make and valgrind-devel, but the old ones are good # enough. -BuildRequires: devtoolset-8-gcc-c++ >= 8.2.1 +BuildRequires: devtoolset-8-gcc-c++ = 8.3.1 %else BuildRequires: gcc-c++ %endif @@ -271,9 +271,9 @@ BuildRequires: redhat-lsb-core %if 0%{with python2} BuildRequires: python2-Cython %endif -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-Cython +#BuildRequires: python%{python3_pkgversion}-devel +#BuildRequires: python%{python3_pkgversion}-setuptools +#BuildRequires: python%{python3_pkgversion}-Cython BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-sphinx BuildRequires: lz4-devel >= 1.7 @@ -574,7 +574,7 @@ Summary: Ceph fuse-based client Group: System/Filesystems %endif Requires: fuse -Requires: python%{python3_pkgversion} +Requires: python %description fuse FUSE based client for Ceph distributed network file system @@ -735,21 +735,21 @@ This package contains Python 2 libraries for interacting with Cephs RADOS gateway. %endif -%package -n python%{python3_pkgversion}-rgw -Summary: Python 3 libraries for the RADOS gateway -%if 0%{?suse_version} -Group: Development/Libraries/Python -%endif -Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} -%{?python_provide:%python_provide python%{python3_pkgversion}-rgw} -%if 0%{without python2} -Provides: python-rgw = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-rgw < %{_epoch_prefix}%{version}-%{release} -%endif -%description -n python%{python3_pkgversion}-rgw -This package contains Python 3 libraries for interacting with Cephs RADOS -gateway. +#%package -n python%{python3_pkgversion}-rgw +#Summary: Python 3 libraries for the RADOS gateway +#%if 0%{?suse_version} +#Group: Development/Libraries/Python +#%endif +#Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +#Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} +#%{?python_provide:%python_provide python%{python3_pkgversion}-rgw} +#%if 0%{without python2} +#Provides: python-rgw = %{_epoch_prefix}%{version}-%{release} +#Obsoletes: python-rgw < %{_epoch_prefix}%{version}-%{release} +#%endif +#%description -n python%{python3_pkgversion}-rgw +#This package contains Python 3 libraries for interacting with Cephs RADOS +#gateway. %if 0%{with python2} %package -n python-rados @@ -765,21 +765,21 @@ This package contains Python 2 libraries for interacting with Cephs RADOS object store. %endif -%package -n python%{python3_pkgversion}-rados -Summary: Python 3 libraries for the RADOS object store -%if 0%{?suse_version} -Group: Development/Libraries/Python -%endif -Requires: python%{python3_pkgversion} -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -%{?python_provide:%python_provide python%{python3_pkgversion}-rados} -%if 0%{without python2} -Provides: python-rados = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-rados < %{_epoch_prefix}%{version}-%{release} -%endif -%description -n python%{python3_pkgversion}-rados -This package contains Python 3 libraries for interacting with Cephs RADOS -object store. +#%package -n python%{python3_pkgversion}-rados +#Summary: Python 3 libraries for the RADOS object store +#%if 0%{?suse_version} +#Group: Development/Libraries/Python +#%endif +#Requires: python%{python3_pkgversion} +#Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +#%{?python_provide:%python_provide python%{python3_pkgversion}-rados} +#%if 0%{without python2} +#Provides: python-rados = %{_epoch_prefix}%{version}-%{release} +#Obsoletes: python-rados < %{_epoch_prefix}%{version}-%{release} +#%endif +#%description -n python%{python3_pkgversion}-rados +#This package contains Python 3 libraries for interacting with Cephs RADOS +#object store. %if 0%{with libradosstriper} %package -n libradosstriper1 @@ -857,22 +857,22 @@ This package contains Python 2 libraries for interacting with Cephs RADOS block device. %endif -%package -n python%{python3_pkgversion}-rbd -Summary: Python 3 libraries for the RADOS block device -%if 0%{?suse_version} -Group: Development/Libraries/Python -%endif -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} -%{?python_provide:%python_provide python%{python3_pkgversion}-rbd} -Provides: python3-rbd = %{_epoch_prefix}%{version}-%{release} -%if 0%{without python2} -Provides: python-rbd = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-rbd < %{_epoch_prefix}%{version}-%{release} -%endif -%description -n python%{python3_pkgversion}-rbd -This package contains Python 3 libraries for interacting with Cephs RADOS -block device. +#%package -n python%{python3_pkgversion}-rbd +#Summary: Python 3 libraries for the RADOS block device +#%if 0%{?suse_version} +#Group: Development/Libraries/Python +#%endif +#Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +#Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} +#%{?python_provide:%python_provide python%{python3_pkgversion}-rbd} +#Provides: python3-rbd = %{_epoch_prefix}%{version}-%{release} +#%if 0%{without python2} +#Provides: python-rbd = %{_epoch_prefix}%{version}-%{release} +#Obsoletes: python-rbd < %{_epoch_prefix}%{version}-%{release} +#%endif +#%description -n python%{python3_pkgversion}-rbd +#This package contains Python 3 libraries for interacting with Cephs RADOS +#block device. %package -n libcephfs2 Summary: Ceph distributed file system client library @@ -920,22 +920,22 @@ This package contains Python 2 libraries for interacting with Cephs distributed file system. %endif -%package -n python%{python3_pkgversion}-cephfs -Summary: Python 3 libraries for Ceph distributed file system -%if 0%{?suse_version} -Group: Development/Libraries/Python -%endif -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} -%{?python_provide:%python_provide python%{python3_pkgversion}-cephfs} -%if 0%{without python2} -Provides: python-cephfs = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-cephfs < %{_epoch_prefix}%{version}-%{release} -%endif -%description -n python%{python3_pkgversion}-cephfs -This package contains Python 3 libraries for interacting with Cephs distributed -file system. +#%package -n python%{python3_pkgversion}-cephfs +#Summary: Python 3 libraries for Ceph distributed file system +#%if 0%{?suse_version} +#Group: Development/Libraries/Python +#%endif +#Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +#Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} +#Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} +#%{?python_provide:%python_provide python%{python3_pkgversion}-cephfs} +#%if 0%{without python2} +#Provides: python-cephfs = %{_epoch_prefix}%{version}-%{release} +#Obsoletes: python-cephfs < %{_epoch_prefix}%{version}-%{release} +#%endif +#%description -n python%{python3_pkgversion}-cephfs +#This package contains Python 3 libraries for interacting with Cephs distributed +#file system. %if 0%{with python2} %package -n python-ceph-argparse @@ -950,17 +950,17 @@ command-description information, validating user command input against those descriptions, and submitting the command to the appropriate daemon. %endif -%package -n python%{python3_pkgversion}-ceph-argparse -Summary: Python 3 utility libraries for Ceph CLI -%if 0%{?suse_version} -Group: Development/Libraries/Python -%endif -%{?python_provide:%python_provide python%{python3_pkgversion}-ceph-argparse} -%description -n python%{python3_pkgversion}-ceph-argparse -This package contains types and routines for Python 3 used by the Ceph CLI as -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. +#%package -n python%{python3_pkgversion}-ceph-argparse +#Summary: Python 3 utility libraries for Ceph CLI +#%if 0%{?suse_version} +#Group: Development/Libraries/Python +#%endif +#%{?python_provide:%python_provide python%{python3_pkgversion}-ceph-argparse} +#%description -n python%{python3_pkgversion}-ceph-argparse +#This package contains types and routines for Python 3 used by the Ceph CLI as +#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 cephfs_shell} %package -n cephfs-shell @@ -1176,7 +1176,6 @@ ${CMAKE} .. \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/ceph \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DWITH_MANPAGE=ON \ - -DWITH_PYTHON3=%{python3_version} \ -DWITH_MGR_DASHBOARD_FRONTEND=OFF \ %if %{with python2} -DWITH_PYTHON2=ON \ @@ -1988,9 +1987,9 @@ fi %{python_sitearch}/rados-*.egg-info %endif -%files -n python%{python3_pkgversion}-rados -%{python3_sitearch}/rados.cpython*.so -%{python3_sitearch}/rados-*.egg-info +#%files -n python%{python3_pkgversion}-rados +#%{python3_sitearch}/rados.cpython*.so +#%{python3_sitearch}/rados-*.egg-info %if 0%{with libradosstriper} %files -n libradosstriper1 @@ -2057,9 +2056,9 @@ fi %{python_sitearch}/rgw-*.egg-info %endif -%files -n python%{python3_pkgversion}-rgw -%{python3_sitearch}/rgw.cpython*.so -%{python3_sitearch}/rgw-*.egg-info +#%files -n python%{python3_pkgversion}-rgw +#%{python3_sitearch}/rgw.cpython*.so +#%{python3_sitearch}/rgw-*.egg-info %if 0%{with python2} %files -n python-rbd @@ -2067,9 +2066,9 @@ fi %{python_sitearch}/rbd-*.egg-info %endif -%files -n python%{python3_pkgversion}-rbd -%{python3_sitearch}/rbd.cpython*.so -%{python3_sitearch}/rbd-*.egg-info +#%files -n python%{python3_pkgversion}-rbd +#%{python3_sitearch}/rbd.cpython*.so +#%{python3_sitearch}/rbd-*.egg-info %files -n libcephfs2 %{_libdir}/libcephfs.so.* @@ -2092,11 +2091,11 @@ fi %{python_sitelib}/ceph_volume_client.py* %endif -%files -n python%{python3_pkgversion}-cephfs -%{python3_sitearch}/cephfs.cpython*.so -%{python3_sitearch}/cephfs-*.egg-info -%{python3_sitelib}/ceph_volume_client.py -%{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py* +#%files -n python%{python3_pkgversion}-cephfs +#%{python3_sitearch}/cephfs.cpython*.so +#%{python3_sitearch}/cephfs-*.egg-info +#%{python3_sitelib}/ceph_volume_client.py +#%{python3_sitelib}/__pycache__/ceph_volume_client.cpython*.py* %if 0%{with python2} %files -n python-ceph-argparse @@ -2104,17 +2103,17 @@ fi %{python_sitelib}/ceph_daemon.py* %endif -%files -n python%{python3_pkgversion}-ceph-argparse -%{python3_sitelib}/ceph_argparse.py -%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py* -%{python3_sitelib}/ceph_daemon.py -%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py* +#%files -n python%{python3_pkgversion}-ceph-argparse +#%{python3_sitelib}/ceph_argparse.py +#%{python3_sitelib}/__pycache__/ceph_argparse.cpython*.py* +#%{python3_sitelib}/ceph_daemon.py +#%{python3_sitelib}/__pycache__/ceph_daemon.cpython*.py* -%if 0%{with cephfs_shell} -%files -n cephfs-shell -%{python3_sitelib}/cephfs_shell-*.egg-info -%{_bindir}/cephfs-shell -%endif +#%if 0%{with cephfs_shell} +#%files -n cephfs-shell +#%{python3_sitelib}/cephfs_shell-*.egg-info +#%{_bindir}/cephfs-shell +#%endif %if 0%{with ceph_test_package} %files -n ceph-test