diff --git a/_constraints b/_constraints index 9fb80bb..71e6369 100644 --- a/_constraints +++ b/_constraints @@ -19,14 +19,60 @@ + x86_64 ceph-test - 40 + 28 - 12 + 11 + + + + + + + aarch64 + ceph-test + + + + 28 + + + 8 + + + + + + + ppc64le + ceph-test + + + + 28 + + + 8 + + + + + + + s390x + ceph-test + + + + 28 + + + 8 diff --git a/ceph-test.changes b/ceph-test.changes index 283a988..0270864 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Thu Apr 12 02:11:19 UTC 2018 - ncutler@suse.com + +- tweak the ceph-test constraints (latest version of Ceph does not + require so much disk space/memory) + ------------------------------------------------------------------- Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de -- Reduce constraints on aarch64 +- Reduce ceph-test constraints on aarch64 ------------------------------------------------------------------- Tue Mar 21 06:03:25 UTC 2018 - ncutler@suse.com diff --git a/ceph.changes b/ceph.changes index 283a988..0270864 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Thu Apr 12 02:11:19 UTC 2018 - ncutler@suse.com + +- tweak the ceph-test constraints (latest version of Ceph does not + require so much disk space/memory) + ------------------------------------------------------------------- Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de -- Reduce constraints on aarch64 +- Reduce ceph-test constraints on aarch64 ------------------------------------------------------------------- Tue Mar 21 06:03:25 UTC 2018 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 69ef1c2..6d2905d 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,24 +1,18 @@ # # spec file for package ceph # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file # at the top-level directory of this distribution and at # https://github.com/ceph/ceph/blob/master/COPYING # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# upon. +# +# This file is under the GNU Lesser General Public License, version 2.1 +# +# Please submit bugfixes or comments via http://tracker.ceph.com/ # - - %bcond_without ocf %bcond_with make_check %ifarch s390 s390x @@ -81,23 +75,24 @@ ################################################################################# # main package definition ################################################################################# -Name: ceph -Version: 13.0.1.3204+g17e0216271 -Release: 0%{?dist} +Name: ceph +Version: 13.0.1.3204+g17e0216271 +Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} +Epoch: 2 %endif # define _epoch_prefix macro which will expand to the empty string if epoch is # undefined -%global _epoch_prefix %{?epoch:} +%global _epoch_prefix %{?epoch:%{epoch}:} -Summary: User space components of the Ceph file system -License: LGPL-2.1-only AND CC-BY-SA-3.0 AND GPL-2.0-only AND BSL-1.0 AND BSD-3-Clause AND MIT -Group: System/Filesystems +Summary: User space components of the Ceph file system +License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT %if 0%{?suse_version} +Group: System/Filesystems %endif -URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3204-g17e0216271.tar.bz2 +URL: http://ceph.com/ +Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3204-g17e0216271.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -109,157 +104,157 @@ ExclusiveArch: x86_64 aarch64 ppc64le s390x ################################################################################# # dependencies that apply across all distro families ################################################################################# +Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mds = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mon = %{_epoch_prefix}%{version}-%{release} -Requires: ceph-osd = %{_epoch_prefix}%{version}-%{release} Requires(post): binutils %if 0%{with cephfs_java} -BuildRequires: java-devel -BuildRequires: sharutils +BuildRequires: java-devel +BuildRequires: sharutils %endif %if 0%{with selinux} -BuildRequires: checkpolicy -BuildRequires: selinux-policy-devel +BuildRequires: checkpolicy +BuildRequires: selinux-policy-devel %endif -BuildRequires: bc +BuildRequires: bc +BuildRequires: gperf BuildRequires: cmake -BuildRequires: cryptsetup -BuildRequires: fuse-devel -BuildRequires: gperf +BuildRequires: cryptsetup +BuildRequires: fuse-devel %if 0%{?rhel} == 7 # devtoolset offers newer make and valgrind-devel, but the old ones are good # enough. -BuildRequires: devtoolset-7-gcc-c++ +BuildRequires: devtoolset-7-gcc-c++ %else -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ %endif -BuildRequires: gdbm +BuildRequires: gdbm %if 0%{with tcmalloc} -BuildRequires: gperftools-devel >= 2.4 +BuildRequires: gperftools-devel >= 2.4 %endif BuildRequires: jq -BuildRequires: leveldb-devel > 1.2 -BuildRequires: libaio-devel -BuildRequires: libblkid-devel >= 2.17 -BuildRequires: libcurl-devel -BuildRequires: libtool -BuildRequires: libudev-devel -BuildRequires: libuuid-devel -BuildRequires: libxml2-devel -BuildRequires: make -BuildRequires: parted -BuildRequires: perl -BuildRequires: pkgconfig +BuildRequires: leveldb-devel > 1.2 +BuildRequires: libaio-devel +BuildRequires: libblkid-devel >= 2.17 +BuildRequires: libcurl-devel +BuildRequires: libudev-devel +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRequires: libuuid-devel +BuildRequires: make +BuildRequires: parted +BuildRequires: perl +BuildRequires: pkgconfig BuildRequires: procps -BuildRequires: python%{_python_buildid} -BuildRequires: python%{_python_buildid}-devel -BuildRequires: python%{_python_buildid}-nose -BuildRequires: python%{_python_buildid}-requests -BuildRequires: python%{_python_buildid}-virtualenv -BuildRequires: snappy-devel +BuildRequires: python%{_python_buildid} +BuildRequires: python%{_python_buildid}-devel +BuildRequires: python%{_python_buildid}-nose +BuildRequires: python%{_python_buildid}-requests +BuildRequires: python%{_python_buildid}-virtualenv +BuildRequires: snappy-devel %if 0%{with make_check} -BuildRequires: socat +BuildRequires: socat %endif -BuildRequires: udev -BuildRequires: util-linux -BuildRequires: valgrind-devel -BuildRequires: which -BuildRequires: xfsprogs -BuildRequires: xfsprogs-devel -BuildRequires: xmlstarlet -BuildRequires: yasm +BuildRequires: udev +BuildRequires: util-linux +BuildRequires: valgrind-devel +BuildRequires: which +BuildRequires: xfsprogs +BuildRequires: xfsprogs-devel +BuildRequires: xmlstarlet +BuildRequires: yasm ################################################################################# # distro-conditional dependencies ################################################################################# %if 0%{?suse_version} -BuildRequires: systemd -BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(systemd) +BuildRequires: systemd-rpm-macros +BuildRequires: systemd %{?systemd_requires} -PreReq: %fillup_prereq +PreReq: %fillup_prereq +BuildRequires: net-tools +BuildRequires: libbz2-devel BuildRequires: btrfsprogs -BuildRequires: cunit-devel -BuildRequires: keyutils-devel -BuildRequires: libbz2-devel +BuildRequires: mozilla-nss-devel +BuildRequires: keyutils-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release -BuildRequires: mozilla-nss-devel -BuildRequires: net-tools BuildRequires: openldap2-devel -BuildRequires: python%{_python_buildid}-Cython -BuildRequires: python%{_python_buildid}-PrettyTable -BuildRequires: python%{_python_buildid}-Sphinx -BuildRequires: python%{_python_buildid}-base +BuildRequires: cunit-devel +BuildRequires: python%{_python_buildid}-base +BuildRequires: python%{_python_buildid}-Cython +BuildRequires: python%{_python_buildid}-PrettyTable +BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: rdma-core-devel %endif %if 0%{?fedora} || 0%{?rhel} -Requires: systemd -BuildRequires: CUnit-devel -BuildRequires: Cython%{_python_buildid} +Requires: systemd BuildRequires: boost-random -BuildRequires: btrfs-progs -BuildRequires: keyutils-libs-devel -BuildRequires: libibverbs-devel -BuildRequires: nss-devel +BuildRequires: btrfs-progs +BuildRequires: nss-devel +BuildRequires: keyutils-libs-devel +BuildRequires: libibverbs-devel BuildRequires: openldap-devel BuildRequires: openssl-devel -BuildRequires: python%{_python_buildid}-prettytable -BuildRequires: python%{_python_buildid}-sphinx +BuildRequires: CUnit-devel BuildRequires: redhat-lsb-core +BuildRequires: Cython%{_python_buildid} +BuildRequires: python%{_python_buildid}-prettytable +BuildRequires: python%{_python_buildid}-sphinx %endif # python34-... for RHEL, python3-... for all other supported distros %if 0%{?rhel} -BuildRequires: python34-Cython -BuildRequires: python34-devel -BuildRequires: python34-setuptools +BuildRequires: python34-devel +BuildRequires: python34-setuptools +BuildRequires: python34-Cython %else -BuildRequires: python3-Cython -BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-Cython %endif # distro-conditional make check dependencies %if 0%{with make_check} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: python%{_python_buildid}-cherrypy -BuildRequires: python%{_python_buildid}-coverage -BuildRequires: python%{_python_buildid}-pecan -BuildRequires: python%{_python_buildid}-tox -BuildRequires: python%{_python_buildid}-werkzeug +BuildRequires: python%{_python_buildid}-cherrypy +BuildRequires: python%{_python_buildid}-pecan +BuildRequires: python%{_python_buildid}-werkzeug +BuildRequires: python%{_python_buildid}-tox +BuildRequires: python%{_python_buildid}-coverage %if 0%{?fedora} -BuildRequires: python%{_python_buildid}-bcrypt +BuildRequires: python%{_python_buildid}-bcrypt %endif %if 0%{?rhel} -BuildRequires: py-bcrypt +BuildRequires: py-bcrypt %endif %endif %if 0%{?suse_version} -BuildRequires: python%{_python_buildid}-CherryPy -BuildRequires: python%{_python_buildid}-Werkzeug -BuildRequires: python%{_python_buildid}-bcrypt -BuildRequires: python%{_python_buildid}-coverage -BuildRequires: python%{_python_buildid}-numpy-devel -BuildRequires: python%{_python_buildid}-pecan -BuildRequires: python%{_python_buildid}-tox +BuildRequires: python%{_python_buildid}-CherryPy +BuildRequires: python%{_python_buildid}-Werkzeug +BuildRequires: python%{_python_buildid}-pecan +BuildRequires: python%{_python_buildid}-numpy-devel +BuildRequires: python%{_python_buildid}-bcrypt +BuildRequires: python%{_python_buildid}-tox +BuildRequires: python%{_python_buildid}-coverage %endif %endif # lttng and babeltrace for rbd-replay-prep %if %{with lttng} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: libbabeltrace-devel -BuildRequires: lttng-ust-devel +BuildRequires: lttng-ust-devel +BuildRequires: libbabeltrace-devel %endif %if 0%{?suse_version} +BuildRequires: lttng-ust-devel BuildRequires: babeltrace-devel -BuildRequires: lttng-ust-devel %endif %endif %if 0%{?suse_version} -BuildRequires: libexpat-devel +BuildRequires: libexpat-devel %endif %if 0%{?rhel} || 0%{?fedora} -BuildRequires: expat-devel +BuildRequires: expat-devel %endif #hardened-cc1 %if 0%{?fedora} || 0%{?rhel} @@ -275,55 +270,55 @@ on commodity hardware and delivers object, block and file system storage. # subpackages ################################################################################# %package base -Summary: Ceph Base Package -Group: System/Filesystems +Summary: Ceph Base Package %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} %if 0%{with selinux} -Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} %endif -Requires: cryptsetup -Requires: findutils -Requires: grep -Requires: logrotate -Requires: psmisc -Requires: python%{_python_buildid}-requests -Requires: python%{_python_buildid}-setuptools -Requires: util-linux -Requires: which -Requires: xfsprogs +Requires: cryptsetup +Requires: findutils +Requires: grep +Requires: logrotate +Requires: psmisc +Requires: python%{_python_buildid}-requests +Requires: python%{_python_buildid}-setuptools +Requires: util-linux +Requires: xfsprogs +Requires: which %if 0%{?suse_version} -Recommends: chrony -Provides: libxio = 1.7 -Obsoletes: libxio <= 1.7 +Recommends: chrony +Provides: libxio = 1.7 +Obsoletes: libxio <= 1.7 %endif %description base Base is the package that includes all the files shared amongst ceph servers %package -n ceph-common -Summary: Ceph Common -Group: System/Filesystems +Summary: Ceph Common %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-rados = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release} -Requires: python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: python%{_python_buildid}-rados = %{_epoch_prefix}%{version}-%{release} +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} %if 0%{?fedora} || 0%{?rhel} -Requires: python%{_python_buildid}-prettytable -Requires: python%{_python_buildid}-requests +Requires: python%{_python_buildid}-prettytable +Requires: python%{_python_buildid}-requests %endif %if 0%{?suse_version} -Requires: python%{_python_buildid}-PrettyTable -Requires: python%{_python_buildid}-requests +Requires: python%{_python_buildid}-PrettyTable +Requires: python%{_python_buildid}-requests Provides: libxio = 1.7 Obsoletes: libxio <= 1.7 %endif @@ -337,24 +332,22 @@ Common utilities to mount and interact with a ceph storage cluster. Comprised of files that are common to Ceph clients and servers. %package mds -Summary: Ceph Metadata Server Daemon -Group: System/Filesystems +Summary: Ceph Metadata Server Daemon %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} - +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %description mds ceph-mds is the metadata server daemon for the Ceph distributed file system. One or more instances of ceph-mds collectively manage the file system namespace, coordinating access to the shared OSD cluster. %package mon -Summary: Ceph Monitor Daemon -Group: System/Filesystems +Summary: Ceph Monitor Daemon %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} - +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %description mon ceph-mon is the cluster monitor daemon for the Ceph distributed file system. One or more instances of ceph-mon form a Paxos part-time @@ -363,30 +356,30 @@ of cluster membership, configuration, and state. %package mgr Summary: Ceph Manager Daemon -Group: System/Filesystems %if 0%{?suse_version} +Group: System/Filesystems %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} -Requires: pyOpenSSL%{_python_buildid} Requires: python%{_python_buildid}-cherrypy Requires: python%{_python_buildid}-jinja2 Requires: python%{_python_buildid}-pecan Requires: python%{_python_buildid}-werkzeug +Requires: pyOpenSSL%{_python_buildid} %if 0%{?fedora} -Requires: python%{_python_buildid}-bcrypt +Requires: python%{_python_buildid}-bcrypt %endif %if 0%{?rhel} -Requires: py-bcrypt +Requires: py-bcrypt %endif %endif %if 0%{?suse_version} Requires: python%{_python_buildid}-CherryPy Requires: python%{_python_buildid}-Jinja2 Requires: python%{_python_buildid}-Werkzeug -Requires: python%{_python_buildid}-bcrypt Requires: python%{_python_buildid}-pecan Requires: python%{_python_buildid}-pyOpenSSL +Requires: python%{_python_buildid}-bcrypt Recommends: python%{_python_buildid}-influxdb %endif %description mgr @@ -396,62 +389,58 @@ the cluster maps, the daemon metadata, and performance counters, and exposes all these to the python modules. %package fuse -Summary: Ceph fuse-based client -Group: System/Filesystems +Summary: Ceph fuse-based client %if 0%{?suse_version} +Group: System/Filesystems %endif Requires: fuse - %description fuse FUSE based client for Ceph distributed network file system %package -n rbd-fuse -Summary: Ceph fuse-based client -Group: System/Filesystems +Summary: Ceph fuse-based client %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} - +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} %description -n rbd-fuse FUSE based client to map Ceph rbd images to files %package -n rbd-mirror -Summary: Ceph daemon for mirroring RBD images -Group: System/Filesystems +Summary: Ceph daemon for mirroring RBD images %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} - +Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n rbd-mirror Daemon for mirroring RBD images between Ceph clusters, streaming changes asynchronously. %package -n rbd-nbd -Summary: Ceph RBD client base on NBD -Group: System/Filesystems +Summary: Ceph RBD client base on NBD %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} - +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} %description -n rbd-nbd NBD based client to map Ceph rbd images to local device %package radosgw -Summary: Rados REST gateway -Group: System/Filesystems +Summary: Rados REST gateway %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} %if 0%{with selinux} -Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?rhel} || 0%{?fedora} -Requires: mailcap +Requires: mailcap %endif %description radosgw RADOS is a distributed object store used by the Ceph distributed @@ -461,13 +450,12 @@ service as well as the OpenStack Object Storage ("Swift") API. %if %{with ocf} %package resource-agents -Summary: OCF-compliant resource agents for Ceph daemons -Group: System/Filesystems +Summary: OCF-compliant resource agents for Ceph daemons %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version} -Requires: resource-agents - +Requires: ceph-base = %{_epoch_prefix}%{version} +Requires: resource-agents %description resource-agents Resource agents for monitoring and managing Ceph daemons under Open Cluster Framework (OCF) compliant resource @@ -475,33 +463,32 @@ managers such as Pacemaker. %endif %package osd -Summary: Ceph Object Storage Daemon -Group: System/Filesystems +Summary: Ceph Object Storage Daemon %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} # for sgdisk, used by ceph-disk %if 0%{?fedora} || 0%{?rhel} -Requires: gdisk +Requires: gdisk %endif %if 0%{?suse_version} -Requires: gptfdisk +Requires: gptfdisk %endif -Requires: lvm2 -Requires: parted - +Requires: parted +Requires: lvm2 %description osd ceph-osd is the object storage daemon for the Ceph distributed file system. It is responsible for storing objects on a local file system and providing access to them over the network. %package -n librados2 -Summary: RADOS distributed object store client library -Group: System/Libraries +Summary: RADOS distributed object store client library %if 0%{?suse_version} +Group: System/Libraries %endif %if 0%{?rhel} || 0%{?fedora} -Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} %endif %description -n librados2 RADOS is a reliable, autonomic distributed object storage cluster @@ -510,135 +497,126 @@ shared library allowing applications to access the distributed object store using a simple file-like interface. %package -n librados-devel -Summary: RADOS headers -Group: Development/Libraries/C and C++ +Summary: RADOS headers %if 0%{?suse_version} +Group: Development/Libraries/C and C++ %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: librados2-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: librados2-devel < %{_epoch_prefix}%{version}-%{release} - +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: librados2-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: librados2-devel < %{_epoch_prefix}%{version}-%{release} %description -n librados-devel This package contains libraries and headers needed to develop programs that use RADOS object store. %package -n librgw2 -Summary: RADOS gateway client library -Group: System/Libraries +Summary: RADOS gateway client library %if 0%{?suse_version} +Group: System/Libraries %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} - +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n librgw2 This package provides a library implementation of the RADOS gateway (distributed object store with S3 and Swift personalities). %package -n librgw-devel -Summary: RADOS gateway client library -Group: Development/Libraries/C and C++ +Summary: RADOS gateway client library %if 0%{?suse_version} +Group: Development/Libraries/C and C++ %endif -Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} -Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} -Provides: librgw2-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: librgw2-devel < %{_epoch_prefix}%{version}-%{release} - +Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +Provides: librgw2-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: librgw2-devel < %{_epoch_prefix}%{version}-%{release} %description -n librgw-devel This package contains libraries and headers needed to develop programs that use RADOS gateway client library. %if 0%{with python2} %package -n python-rgw -Summary: Python 2 libraries for the RADOS gateway -Group: Development/Libraries/Python +Summary: Python 2 libraries for the RADOS gateway %if 0%{?suse_version} +Group: Development/Libraries/Python %endif -Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} -Requires: python-rados = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} - +Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +Requires: python-rados = %{_epoch_prefix}%{version}-%{release} +Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} %description -n python-rgw 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 -Group: Development/Libraries/Python +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} - +Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} +Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} %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 -Summary: Python 2 libraries for the RADOS object store -Group: Development/Libraries/Python +Summary: Python 2 libraries for the RADOS object store %if 0%{?suse_version} +Group: Development/Libraries/Python %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} - +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} %description -n python-rados 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 -Group: Development/Libraries/Python +Summary: Python 3 libraries for the RADOS object store %if 0%{?suse_version} +Group: Development/Libraries/Python %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion} - +Requires: python%{python3_pkgversion} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-rados This package contains Python 3 libraries for interacting with Cephs RADOS object store. %package -n libradosstriper1 -Summary: RADOS striping interface -Group: System/Libraries +Summary: RADOS striping interface %if 0%{?suse_version} +Group: System/Libraries %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} - +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description -n libradosstriper1 Striping interface built on top of the rados library, allowing to stripe bigger objects onto several standard rados objects using an interface very similar to the rados one. %package -n libradosstriper-devel -Summary: RADOS striping interface headers -Group: Development/Libraries/C and C++ +Summary: RADOS striping interface headers %if 0%{?suse_version} +Group: Development/Libraries/C and C++ %endif -Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} -Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: libradosstriper1-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: libradosstriper1-devel < %{_epoch_prefix}%{version}-%{release} - +Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: libradosstriper1-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: libradosstriper1-devel < %{_epoch_prefix}%{version}-%{release} %description -n libradosstriper-devel This package contains libraries and headers needed to develop programs that use RADOS striping interface. %package -n librbd1 -Summary: RADOS block device client library -Group: System/Libraries +Summary: RADOS block device client library %if 0%{?suse_version} +Group: System/Libraries %endif -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?suse_version} Requires(post): coreutils %endif %if 0%{?rhel} || 0%{?fedora} -Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} %endif %description -n librbd1 RBD is a block device striped across multiple distributed objects in @@ -647,56 +625,53 @@ developed as part of the Ceph distributed storage system. This is a shared library allowing applications to manage these block devices. %package -n librbd-devel -Summary: RADOS block device headers -Group: Development/Libraries/C and C++ +Summary: RADOS block device headers %if 0%{?suse_version} +Group: Development/Libraries/C and C++ %endif -Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: librbd1-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: librbd1-devel < %{_epoch_prefix}%{version}-%{release} - +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: librbd1-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: librbd1-devel < %{_epoch_prefix}%{version}-%{release} %description -n librbd-devel This package contains libraries and headers needed to develop programs that use RADOS block device. %if 0%{with python2} %package -n python-rbd -Summary: Python 2 libraries for the RADOS block device -Group: Development/Libraries/Python +Summary: Python 2 libraries for the RADOS block device %if 0%{?suse_version} +Group: Development/Libraries/Python %endif -Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} -Requires: python-rados = %{_epoch_prefix}%{version}-%{release} -Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} - +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: python-rados = %{_epoch_prefix}%{version}-%{release} +Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} %description -n python-rbd 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 -Group: Development/Libraries/Python +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} - +Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} +Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} %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 -Group: System/Libraries +Summary: Ceph distributed file system client library %if 0%{?suse_version} +Group: System/Libraries %endif -Obsoletes: libcephfs1 +Obsoletes: libcephfs1 %if 0%{?rhel} || 0%{?fedora} -Obsoletes: ceph-libcephfs -Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-libcephfs %endif %description -n libcephfs2 Ceph is a distributed network file system designed to provide excellent @@ -705,54 +680,51 @@ allowing applications to access a Ceph distributed file system via a POSIX-like interface. %package -n libcephfs-devel -Summary: Ceph distributed file system headers -Group: Development/Libraries/C and C++ +Summary: Ceph distributed file system headers %if 0%{?suse_version} +Group: Development/Libraries/C and C++ %endif -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} -Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: libcephfs2-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: libcephfs2-devel < %{_epoch_prefix}%{version}-%{release} - +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: libcephfs2-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: libcephfs2-devel < %{_epoch_prefix}%{version}-%{release} %description -n libcephfs-devel This package contains libraries and headers needed to develop programs that use Cephs distributed file system. %if 0%{with python2} %package -n python-cephfs -Summary: Python 2 libraries for Ceph distributed file system -Group: Development/Libraries/Python +Summary: Python 2 libraries for Ceph distributed file system %if 0%{?suse_version} +Group: Development/Libraries/Python %endif -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?suse_version} -Recommends: python-rados = %{_epoch_prefix}%{version}-%{release} +Recommends: python-rados = %{_epoch_prefix}%{version}-%{release} %endif -Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} - +Obsoletes: python-ceph < %{_epoch_prefix}%{version}-%{release} %description -n python-cephfs 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 -Group: Development/Libraries/Python +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: libcephfs2 = %{_epoch_prefix}%{version}-%{release} +Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} %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%{python3_pkgversion}-ceph-argparse -Summary: Python 3 utility libraries for Ceph CLI -Group: Development/Libraries/Python +Summary: Python 3 utility libraries for Ceph CLI %if 0%{?suse_version} +Group: Development/Libraries/Python %endif %description -n python%{python3_pkgversion}-ceph-argparse This package contains types and routines for Python 3 used by the Ceph CLI as @@ -763,15 +735,14 @@ descriptions, and submitting the command to the appropriate daemon. %if 0%{with ceph_test_package} %package -n ceph-test -Summary: Ceph benchmarks and test tools -Group: System/Benchmark +Summary: Ceph benchmarks and test tools %if 0%{?suse_version} +Group: System/Benchmark %endif -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} -Requires: jq -Requires: socat -Requires: xmlstarlet - +Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: xmlstarlet +Requires: jq +Requires: socat %description -n ceph-test This package contains Ceph benchmarks and test tools. %endif @@ -779,42 +750,39 @@ This package contains Ceph benchmarks and test tools. %if 0%{with cephfs_java} %package -n libcephfs_jni1 -Summary: Java Native Interface library for CephFS Java bindings -Group: System/Libraries +Summary: Java Native Interface library for CephFS Java bindings %if 0%{?suse_version} +Group: System/Libraries %endif -Requires: java -Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} - +Requires: java +Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} %description -n libcephfs_jni1 This package contains the Java Native Interface library for CephFS Java bindings. %package -n libcephfs_jni-devel -Summary: Development files for CephFS Java Native Interface library -Group: Development/Libraries/Java +Summary: Development files for CephFS Java Native Interface library %if 0%{?suse_version} +Group: Development/Libraries/Java %endif -Requires: java -Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} -Provides: libcephfs_jni1-devel = %{_epoch_prefix}%{version}-%{release} -Obsoletes: libcephfs_jni1-devel < %{_epoch_prefix}%{version}-%{release} - +Requires: java +Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: libcephfs_jni1-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: libcephfs_jni1-devel < %{_epoch_prefix}%{version}-%{release} %description -n libcephfs_jni-devel This package contains the development files for CephFS Java Native Interface library. %package -n cephfs-java -Summary: Java libraries for the Ceph File System -Group: System/Libraries +Summary: Java libraries for the Ceph File System %if 0%{?suse_version} +Group: System/Libraries %endif -Requires: java +Requires: java +Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} Requires: junit -Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} BuildRequires: junit - %description -n cephfs-java This package contains the Java libraries for the Ceph File System. @@ -822,11 +790,10 @@ This package contains the Java libraries for the Ceph File System. %package -n rados-objclass-devel Summary: RADOS object class development kit -Group: Development/Libraries/C and C++ %if 0%{?suse_version} +Group: Development/Libraries/C and C++ %endif Requires: librados2-devel = %{_epoch_prefix}%{version}-%{release} - %description -n rados-objclass-devel This package contains libraries and headers needed to develop RADOS object class plugins. @@ -834,17 +801,15 @@ class plugins. %if 0%{with selinux} %package selinux -Summary: SELinux support for Ceph MON, OSD and MDS -Group: System/Filesystems +Summary: SELinux support for Ceph MON, OSD and MDS %if 0%{?suse_version} +Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} -Requires: libselinux-utils -Requires: policycoreutils +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: policycoreutils, libselinux-utils Requires(post): ceph-base = %{_epoch_prefix}%{version}-%{release} Requires(post): selinux-policy-base >= %{_selinux_policy_version}, policycoreutils, gawk Requires(postun): policycoreutils - %description selinux This package contains SELinux support for Ceph MON, OSD and MDS. The package also performs file-system relabelling which can take a long time on heavily @@ -854,17 +819,16 @@ populated file-systems. %if 0%{with python2} %package -n python-ceph-compat -Summary: Compatibility package for Cephs python libraries -Group: Development/Libraries/Python +Summary: Compatibility package for Cephs python libraries %if 0%{?suse_version} +Group: Development/Libraries/Python %endif -Obsoletes: python-ceph -Requires: python-cephfs = %{_epoch_prefix}%{version}-%{release} -Requires: python-rados = %{_epoch_prefix}%{version}-%{release} -Requires: python-rbd = %{_epoch_prefix}%{version}-%{release} -Requires: python-rgw = %{_epoch_prefix}%{version}-%{release} -Provides: python-ceph - +Obsoletes: python-ceph +Requires: python-rados = %{_epoch_prefix}%{version}-%{release} +Requires: python-rbd = %{_epoch_prefix}%{version}-%{release} +Requires: python-cephfs = %{_epoch_prefix}%{version}-%{release} +Requires: python-rgw = %{_epoch_prefix}%{version}-%{release} +Provides: python-ceph %description -n python-ceph-compat This is a compatibility package to accommodate python-ceph split into python-rados, python-rbd, python-rgw and python-cephfs. Packages still @@ -978,6 +942,7 @@ cmake .. \ make "$CEPH_MFLAGS_JOBS" + %if 0%{with make_check} %check # run in-tree unittests @@ -985,6 +950,7 @@ cd build ctest "$CEPH_MFLAGS_JOBS" %endif + %install pushd build make DESTDIR=%{buildroot} install @@ -1902,6 +1868,6 @@ exit 0 # actually build this meta package. %endif -# nospeccleaner %changelog +# nospeccleaner