From eed611b6e3cd395a3f11fb1336ebd550e920ce530763bb2885248d331c8dd4d6 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 12 Apr 2018 02:10:10 +0000 Subject: [PATCH] Accepting request 591639 from home:Andreas_Schwab:Factory - Reduce constraints on aarch64 OBS-URL: https://build.opensuse.org/request/show/591639 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=174 --- _constraints | 15 ++ ceph-test.changes | 5 + ceph-test.spec | 233 ++++++++--------- ceph.changes | 5 + ceph.spec | 640 ++++++++++++++++++++++++---------------------- 5 files changed, 479 insertions(+), 419 deletions(-) diff --git a/_constraints b/_constraints index 9cfd563..9fb80bb 100644 --- a/_constraints +++ b/_constraints @@ -31,4 +31,19 @@ + + + aarch64 + ceph-test + + + + 28 + + + 8 + + + + diff --git a/ceph-test.changes b/ceph-test.changes index 460ed4c..283a988 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de + +- Reduce constraints on aarch64 + ------------------------------------------------------------------- Tue Mar 21 06:03:25 UTC 2018 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 47dae11..c651890 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -1,18 +1,24 @@ # -# spec file for package ceph +# spec file for package ceph-test # +# 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. -# -# This file is under the GNU Lesser General Public License, version 2.1 -# -# Please submit bugfixes or comments via http://tracker.ceph.com/ +# 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/ # + + %bcond_without ocf %bcond_with make_check %ifarch s390 s390x @@ -75,194 +81,190 @@ ################################################################################# # main package definition ################################################################################# -Name: ceph-test -Version: 13.0.1.3204+g17e0216271 -Release: 0%{?dist} +Name: ceph-test +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:%{epoch}:} +%global _epoch_prefix %{?epoch:} -Summary: Ceph benchmarks and test tools -License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT +Summary: Ceph benchmarks and test tools +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 %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} -Source96: checkin.sh -Source97: README-checkin.txt -Source98: README-ceph-test.txt -Source99: ceph-rpmlintrc +Source96: checkin.sh +Source97: README-checkin.txt +Source98: README-ceph-test.txt +Source99: ceph-rpmlintrc # _insert_obs_source_lines_here %if 0%{?is_opensuse} -ExclusiveArch: x86_64 aarch64 ppc64 ppc64le +ExclusiveArch: x86_64 aarch64 ppc64 ppc64le %else -ExclusiveArch: x86_64 aarch64 ppc64le +ExclusiveArch: x86_64 aarch64 ppc64le %endif %endif ################################################################################# # dependencies that apply across all distro families ################################################################################# - - - -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} -Requires: xmlstarlet -Requires: jq -Requires: socat +Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: jq +Requires: socat +Requires: xmlstarlet 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: gperf +BuildRequires: bc BuildRequires: cmake -BuildRequires: cryptsetup -BuildRequires: fuse-devel +BuildRequires: cryptsetup +BuildRequires: fuse-devel +BuildRequires: gperf %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: libudev-devel -BuildRequires: libtool -BuildRequires: libxml2-devel -BuildRequires: libuuid-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: libtool +BuildRequires: libudev-devel +BuildRequires: libuuid-devel +BuildRequires: libxml2-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 -BuildRequires: net-tools -BuildRequires: libbz2-devel +PreReq: %fillup_prereq BuildRequires: btrfsprogs -BuildRequires: mozilla-nss-devel -BuildRequires: keyutils-devel +BuildRequires: cunit-devel +BuildRequires: keyutils-devel +BuildRequires: libbz2-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release +BuildRequires: mozilla-nss-devel +BuildRequires: net-tools BuildRequires: openldap2-devel -BuildRequires: cunit-devel -BuildRequires: python%{_python_buildid}-base -BuildRequires: python%{_python_buildid}-Cython -BuildRequires: python%{_python_buildid}-PrettyTable -BuildRequires: python%{_python_buildid}-Sphinx +BuildRequires: python%{_python_buildid}-Cython +BuildRequires: python%{_python_buildid}-PrettyTable +BuildRequires: python%{_python_buildid}-Sphinx +BuildRequires: python%{_python_buildid}-base BuildRequires: rdma-core-devel %endif %if 0%{?fedora} || 0%{?rhel} +BuildRequires: CUnit-devel +BuildRequires: Cython%{_python_buildid} BuildRequires: boost-random -BuildRequires: btrfs-progs -BuildRequires: nss-devel -BuildRequires: keyutils-libs-devel -BuildRequires: libibverbs-devel +BuildRequires: btrfs-progs +BuildRequires: keyutils-libs-devel +BuildRequires: libibverbs-devel +BuildRequires: nss-devel BuildRequires: openldap-devel BuildRequires: openssl-devel -BuildRequires: CUnit-devel +BuildRequires: python%{_python_buildid}-prettytable +BuildRequires: python%{_python_buildid}-sphinx 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-devel -BuildRequires: python34-setuptools -BuildRequires: python34-Cython +BuildRequires: python34-Cython +BuildRequires: python34-devel +BuildRequires: python34-setuptools %else -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-Cython +BuildRequires: python3-Cython +BuildRequires: python3-devel +BuildRequires: python3-setuptools %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}-pecan -BuildRequires: python%{_python_buildid}-werkzeug -BuildRequires: python%{_python_buildid}-tox -BuildRequires: python%{_python_buildid}-coverage +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 %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}-pecan -BuildRequires: python%{_python_buildid}-numpy-devel -BuildRequires: python%{_python_buildid}-bcrypt -BuildRequires: python%{_python_buildid}-tox -BuildRequires: python%{_python_buildid}-coverage +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 %endif %endif # lttng and babeltrace for rbd-replay-prep %if %{with lttng} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: lttng-ust-devel -BuildRequires: libbabeltrace-devel +BuildRequires: libbabeltrace-devel +BuildRequires: lttng-ust-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} @@ -510,7 +512,6 @@ cmake .. \ make "$CEPH_MFLAGS_JOBS" - %if 0%{with make_check} %check # run in-tree unittests @@ -518,7 +519,6 @@ cd build ctest "$CEPH_MFLAGS_JOBS" %endif - %install pushd build make DESTDIR=%{buildroot} install @@ -972,5 +972,6 @@ rm -rf %{buildroot} %endif # with selinux %if 0%{with python2} %endif -%changelog # nospeccleaner + +%changelog diff --git a/ceph.changes b/ceph.changes index 460ed4c..283a988 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de + +- Reduce constraints on aarch64 + ------------------------------------------------------------------- Tue Mar 21 06:03:25 UTC 2018 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 6d2905d..69ef1c2 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,18 +1,24 @@ # # 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. -# -# This file is under the GNU Lesser General Public License, version 2.1 -# -# Please submit bugfixes or comments via http://tracker.ceph.com/ +# 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/ # + + %bcond_without ocf %bcond_with make_check %ifarch s390 s390x @@ -75,24 +81,23 @@ ################################################################################# # 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:%{epoch}:} +%global _epoch_prefix %{?epoch:} -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 +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 %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} @@ -104,157 +109,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: gperf +BuildRequires: bc BuildRequires: cmake -BuildRequires: cryptsetup -BuildRequires: fuse-devel +BuildRequires: cryptsetup +BuildRequires: fuse-devel +BuildRequires: gperf %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: libudev-devel -BuildRequires: libtool -BuildRequires: libxml2-devel -BuildRequires: libuuid-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: libtool +BuildRequires: libudev-devel +BuildRequires: libuuid-devel +BuildRequires: libxml2-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 -BuildRequires: net-tools -BuildRequires: libbz2-devel +PreReq: %fillup_prereq BuildRequires: btrfsprogs -BuildRequires: mozilla-nss-devel -BuildRequires: keyutils-devel +BuildRequires: cunit-devel +BuildRequires: keyutils-devel +BuildRequires: libbz2-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release +BuildRequires: mozilla-nss-devel +BuildRequires: net-tools BuildRequires: openldap2-devel -BuildRequires: cunit-devel -BuildRequires: python%{_python_buildid}-base -BuildRequires: python%{_python_buildid}-Cython -BuildRequires: python%{_python_buildid}-PrettyTable -BuildRequires: python%{_python_buildid}-Sphinx +BuildRequires: python%{_python_buildid}-Cython +BuildRequires: python%{_python_buildid}-PrettyTable +BuildRequires: python%{_python_buildid}-Sphinx +BuildRequires: python%{_python_buildid}-base BuildRequires: rdma-core-devel %endif %if 0%{?fedora} || 0%{?rhel} -Requires: systemd +Requires: systemd +BuildRequires: CUnit-devel +BuildRequires: Cython%{_python_buildid} BuildRequires: boost-random -BuildRequires: btrfs-progs -BuildRequires: nss-devel -BuildRequires: keyutils-libs-devel -BuildRequires: libibverbs-devel +BuildRequires: btrfs-progs +BuildRequires: keyutils-libs-devel +BuildRequires: libibverbs-devel +BuildRequires: nss-devel BuildRequires: openldap-devel BuildRequires: openssl-devel -BuildRequires: CUnit-devel +BuildRequires: python%{_python_buildid}-prettytable +BuildRequires: python%{_python_buildid}-sphinx 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-devel -BuildRequires: python34-setuptools -BuildRequires: python34-Cython +BuildRequires: python34-Cython +BuildRequires: python34-devel +BuildRequires: python34-setuptools %else -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-Cython +BuildRequires: python3-Cython +BuildRequires: python3-devel +BuildRequires: python3-setuptools %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}-pecan -BuildRequires: python%{_python_buildid}-werkzeug -BuildRequires: python%{_python_buildid}-tox -BuildRequires: python%{_python_buildid}-coverage +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 %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}-pecan -BuildRequires: python%{_python_buildid}-numpy-devel -BuildRequires: python%{_python_buildid}-bcrypt -BuildRequires: python%{_python_buildid}-tox -BuildRequires: python%{_python_buildid}-coverage +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 %endif %endif # lttng and babeltrace for rbd-replay-prep %if %{with lttng} %if 0%{?fedora} || 0%{?rhel} -BuildRequires: lttng-ust-devel -BuildRequires: libbabeltrace-devel +BuildRequires: libbabeltrace-devel +BuildRequires: lttng-ust-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} @@ -270,55 +275,55 @@ on commodity hardware and delivers object, block and file system storage. # subpackages ################################################################################# %package base -Summary: Ceph Base Package +Summary: Ceph Base Package +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -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} +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} %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: xfsprogs -Requires: which +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 %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 +Summary: Ceph Common +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -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} +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} %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 @@ -332,22 +337,24 @@ 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 +Summary: Ceph Metadata Server Daemon +Group: System/Filesystems %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 +Summary: Ceph Monitor Daemon +Group: System/Filesystems %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 @@ -356,30 +363,30 @@ of cluster membership, configuration, and state. %package mgr Summary: Ceph Manager Daemon -%if 0%{?suse_version} Group: System/Filesystems +%if 0%{?suse_version} %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 @@ -389,58 +396,62 @@ the cluster maps, the daemon metadata, and performance counters, and exposes all these to the python modules. %package fuse -Summary: Ceph fuse-based client +Summary: Ceph fuse-based client +Group: System/Filesystems %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 +Summary: Ceph fuse-based client +Group: System/Filesystems %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 +Summary: Ceph daemon for mirroring RBD images +Group: System/Filesystems %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 +Summary: Ceph RBD client base on NBD +Group: System/Filesystems %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 +Summary: Rados REST gateway +Group: System/Filesystems %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 @@ -450,12 +461,13 @@ service as well as the OpenStack Object Storage ("Swift") API. %if %{with ocf} %package resource-agents -Summary: OCF-compliant resource agents for Ceph daemons +Summary: OCF-compliant resource agents for Ceph daemons +Group: System/Filesystems %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 @@ -463,32 +475,33 @@ managers such as Pacemaker. %endif %package osd -Summary: Ceph Object Storage Daemon +Summary: Ceph Object Storage Daemon +Group: System/Filesystems %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: parted -Requires: lvm2 +Requires: lvm2 +Requires: parted + %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 +Summary: RADOS distributed object store client library +Group: System/Libraries %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 @@ -497,126 +510,135 @@ shared library allowing applications to access the distributed object store using a simple file-like interface. %package -n librados-devel -Summary: RADOS headers +Summary: RADOS headers +Group: Development/Libraries/C and C++ %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 +Summary: RADOS gateway client library +Group: System/Libraries %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 +Summary: RADOS gateway client library +Group: Development/Libraries/C and C++ %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 +Summary: Python 2 libraries for the RADOS gateway +Group: Development/Libraries/Python %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 +Summary: Python 3 libraries for the RADOS gateway +Group: Development/Libraries/Python %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 +Summary: Python 2 libraries for the RADOS object store +Group: Development/Libraries/Python %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 +Summary: Python 3 libraries for the RADOS object store +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -Requires: python%{python3_pkgversion} -Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +Requires: python%{python3_pkgversion} + %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 +Summary: RADOS striping interface +Group: System/Libraries %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 +Summary: RADOS striping interface headers +Group: Development/Libraries/C and C++ %if 0%{?suse_version} -Group: Development/Libraries/C and C++ %endif -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} +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} + %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 +Summary: RADOS block device client library +Group: System/Libraries %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 @@ -625,53 +647,56 @@ 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 +Summary: RADOS block device headers +Group: Development/Libraries/C and C++ %if 0%{?suse_version} -Group: Development/Libraries/C and C++ %endif -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} +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} + %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 +Summary: Python 2 libraries for the RADOS block device +Group: Development/Libraries/Python %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 +Summary: Python 3 libraries for the RADOS block device +Group: Development/Libraries/Python %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 +Summary: Ceph distributed file system client library +Group: System/Libraries %if 0%{?suse_version} -Group: System/Libraries %endif -Obsoletes: libcephfs1 +Obsoletes: libcephfs1 %if 0%{?rhel} || 0%{?fedora} -Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} -Obsoletes: ceph-libcephfs +Obsoletes: ceph-libcephfs +Obsoletes: ceph-libs < %{_epoch_prefix}%{version}-%{release} %endif %description -n libcephfs2 Ceph is a distributed network file system designed to provide excellent @@ -680,51 +705,54 @@ allowing applications to access a Ceph distributed file system via a POSIX-like interface. %package -n libcephfs-devel -Summary: Ceph distributed file system headers +Summary: Ceph distributed file system headers +Group: Development/Libraries/C and C++ %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 +Summary: Python 2 libraries for Ceph distributed file system +Group: Development/Libraries/Python %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 +Summary: Python 3 libraries for Ceph distributed file system +Group: Development/Libraries/Python %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 +Summary: Python 3 utility libraries for Ceph CLI +Group: Development/Libraries/Python %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 @@ -735,14 +763,15 @@ 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 +Summary: Ceph benchmarks and test tools +Group: System/Benchmark %if 0%{?suse_version} -Group: System/Benchmark %endif -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} -Requires: xmlstarlet -Requires: jq -Requires: socat +Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: jq +Requires: socat +Requires: xmlstarlet + %description -n ceph-test This package contains Ceph benchmarks and test tools. %endif @@ -750,39 +779,42 @@ 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 +Summary: Java Native Interface library for CephFS Java bindings +Group: System/Libraries %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 +Summary: Development files for CephFS Java Native Interface library +Group: Development/Libraries/Java %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 +Summary: Java libraries for the Ceph File System +Group: System/Libraries %if 0%{?suse_version} -Group: System/Libraries %endif -Requires: java -Requires: libcephfs_jni1 = %{_epoch_prefix}%{version}-%{release} +Requires: java 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. @@ -790,10 +822,11 @@ 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. @@ -801,15 +834,17 @@ class plugins. %if 0%{with selinux} %package selinux -Summary: SELinux support for Ceph MON, OSD and MDS +Summary: SELinux support for Ceph MON, OSD and MDS +Group: System/Filesystems %if 0%{?suse_version} -Group: System/Filesystems %endif -Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} -Requires: policycoreutils, libselinux-utils +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: libselinux-utils +Requires: policycoreutils 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 @@ -819,16 +854,17 @@ populated file-systems. %if 0%{with python2} %package -n python-ceph-compat -Summary: Compatibility package for Cephs python libraries +Summary: Compatibility package for Cephs python libraries +Group: Development/Libraries/Python %if 0%{?suse_version} -Group: Development/Libraries/Python %endif -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 +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 + %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 @@ -942,7 +978,6 @@ cmake .. \ make "$CEPH_MFLAGS_JOBS" - %if 0%{with make_check} %check # run in-tree unittests @@ -950,7 +985,6 @@ cd build ctest "$CEPH_MFLAGS_JOBS" %endif - %install pushd build make DESTDIR=%{buildroot} install @@ -1868,6 +1902,6 @@ exit 0 # actually build this meta package. %endif +# nospeccleaner %changelog -# nospeccleaner