Accepting request 476851 from filesystems:ceph:luminous

- Update to version 12.0.0+git.1488553020.e902441:
  + Recent upstream master (3c0af07629dc661aba84e2fef696339ac7171914)
  + Builds with GCC7 (boo#1025891)

- Update to version 12.0.0+git.1488553020.e902441:
  + Recent upstream master (3c0af07629dc661aba84e2fef696339ac7171914)
  + Builds with GCC7 (boo#1025891)

OBS-URL: https://build.opensuse.org/request/show/476851
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=74
This commit is contained in:
Nathan Cutler 2017-03-04 00:22:30 +00:00 committed by Git OBS Bridge
parent f12e88cb28
commit 4d4aeeb39f
7 changed files with 215 additions and 55 deletions

View File

@ -1,12 +1,12 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="versionformat">11.1.0+git.%ct.%h</param>
<param name="versionformat">12.0.0+git.%ct.%h</param>
<param name="url">git://github.com/SUSE/ceph.git</param>
<param name="revision">ses5</param>
<param name="filename">ceph</param>
<param name="scm">git</param>
<param name="package-meta">no</param>
<param name="changesgenerate">enable</param>
<param name="changesgenerate">disable</param>
<param name="commandtorun">sh etc/ceph_ver_hack.sh</param>
</service>
<service name="extract_ceph_spec" mode="disabled" />

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1603090ad5dfb04fe1c79200a7629c25f062169810b6eba850b3740f8314b95
size 103922840

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:934eca8eb0b1173c4cf7543ad45d1bd53b7150deedc336ad8aa16d3f25430a36
size 103831668

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 3 15:32:06 UTC 2017 - ncutler@suse.com
- Update to version 12.0.0+git.1488553020.e902441:
+ Recent upstream master (3c0af07629dc661aba84e2fef696339ac7171914)
+ Builds with GCC7 (boo#1025891)
-------------------------------------------------------------------
Wed Feb 08 21:28:28 UTC 2017 - ncutler@suse.com

View File

@ -67,7 +67,7 @@
# common
#################################################################################
Name: ceph-test
Version: 11.1.0+git.1486588482.ba197ae
Version: 12.0.0+git.1488578549.776bfa8
Release: 0
Summary: Ceph benchmarks and test tools
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
@ -105,10 +105,7 @@ BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: /usr/share/selinux/devel/policyhelp
%endif
BuildRequires: boost-devel
%if ! 0%{?suse_version}
BuildRequires: boost-python
%endif
BuildRequires: bc
BuildRequires: cmake
BuildRequires: cryptsetup
BuildRequires: fuse-devel
@ -221,6 +218,8 @@ This package contains Ceph benchmarks and test tools.
#################################################################################
# packages
#################################################################################
%if 0%{?suse_version}
%endif
%if 0%{with selinux}
%endif
%if 0%{?suse_version}
@ -229,33 +228,107 @@ This package contains Ceph benchmarks and test tools.
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{with xio}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?fedora} || 0%{?rhel}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{with selinux}
%endif
%if 0%{?rhel} || 0%{?fedora}
%endif
%if %{with ocf}
%if 0%{?suse_version}
%endif
%endif
%if 0%{?suse_version}
%endif
%if 0%{?fedora} || 0%{?rhel}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?rhel} || 0%{?fedora}
%if 0%{?suse_version}
%endif
%if 0%{?rhel} || 0%{?fedora}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?rhel} || 0%{?fedora}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?rhel} || 0%{?fedora}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{with ceph_test_package}
%if 0%{?suse_version}
%endif
%endif
%if 0%{with cephfs_java}
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version}
%endif
%endif
%if 0%{with selinux}
%if 0%{?suse_version}
%endif
%endif
%if 0%{?suse_version}
%endif
%prep
%if 0%{?rhel}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 3 15:32:06 UTC 2017 - ncutler@suse.com
- Update to version 12.0.0+git.1488553020.e902441:
+ Recent upstream master (3c0af07629dc661aba84e2fef696339ac7171914)
+ Builds with GCC7 (boo#1025891)
-------------------------------------------------------------------
Wed Feb 08 21:28:28 UTC 2017 - ncutler@suse.com

161
ceph.spec
View File

@ -67,12 +67,12 @@
# common
#################################################################################
Name: ceph
Version: 11.1.0+git.1486588482.ba197ae
Version: 12.0.0+git.1488578549.776bfa8
Release: 0
Summary: User space components of the Ceph file system
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
%if 0%{?suse_version}
Group: System/Filesystems
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{name}-%{version}.tar.bz2
@ -101,10 +101,7 @@ BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: /usr/share/selinux/devel/policyhelp
%endif
BuildRequires: boost-devel
%if ! 0%{?suse_version}
BuildRequires: boost-python
%endif
BuildRequires: bc
BuildRequires: cmake
BuildRequires: cryptsetup
BuildRequires: fuse-devel
@ -221,7 +218,9 @@ on commodity hardware and delivers object, block and file system storage.
#################################################################################
%package base
Summary: Ceph Base Package
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-common = %{version}-%{release}
Requires: librbd1 = %{version}-%{release}
Requires: librados2 = %{version}-%{release}
@ -251,7 +250,9 @@ Base is the package that includes all the files shared amongst ceph servers
%package -n ceph-common
Summary: Ceph Common
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: librbd1 = %{version}-%{release}
Requires: librados2 = %{version}-%{release}
Requires: libcephfs2 = %{version}-%{release}
@ -274,7 +275,9 @@ Comprised of files that are common to Ceph clients and servers.
%package mds
Summary: Ceph Metadata Server Daemon
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-base = %{version}-%{release}
%description mds
ceph-mds is the metadata server daemon for the Ceph distributed file system.
@ -283,7 +286,9 @@ namespace, coordinating access to the shared OSD cluster.
%package mon
Summary: Ceph Monitor Daemon
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-base = %{version}-%{release}
# For ceph-rest-api
%if 0%{?fedora} || 0%{?rhel}
@ -301,7 +306,9 @@ of cluster membership, configuration, and state.
%package mgr
Summary: Ceph Manager Daemon
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-base = %{version}-%{release}
%description mgr
@ -312,13 +319,17 @@ exposes all these to the python modules.
%package fuse
Summary: Ceph fuse-based client
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
%description fuse
FUSE based client for Ceph distributed network file system
%package -n rbd-fuse
Summary: Ceph fuse-based client
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: librados2 = %{version}-%{release}
Requires: librbd1 = %{version}-%{release}
%description -n rbd-fuse
@ -326,7 +337,9 @@ FUSE based client to map Ceph rbd images to files
%package -n rbd-mirror
Summary: Ceph daemon for mirroring RBD images
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-common = %{version}-%{release}
Requires: librados2 = %{version}-%{release}
%description -n rbd-mirror
@ -335,7 +348,9 @@ changes asynchronously.
%package -n rbd-nbd
Summary: Ceph RBD client base on NBD
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: librados2 = %{version}-%{release}
Requires: librbd1 = %{version}-%{release}
%description -n rbd-nbd
@ -343,7 +358,9 @@ NBD based client to map Ceph rbd images to local device
%package radosgw
Summary: Rados REST gateway
Group: Development/Libraries
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-common = %{version}-%{release}
%if 0%{with selinux}
Requires: ceph-selinux = %{version}-%{release}
@ -362,7 +379,9 @@ 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 Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
License: LGPL-2.0
Requires: ceph-base = %{version}
Requires: resource-agents
@ -374,7 +393,9 @@ managers such as Pacemaker.
%package osd
Summary: Ceph Object Storage Daemon
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-base = %{version}-%{release}
# for sgdisk, used by ceph-disk
%if 0%{?fedora} || 0%{?rhel}
@ -391,7 +412,9 @@ and providing access to them over the network.
%package -n librados2
Summary: RADOS distributed object store client library
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: System/Libraries/C and C++
%endif
License: LGPL-2.0
%if 0%{?rhel} || 0%{?fedora}
Obsoletes: ceph-libs < %{version}-%{release}
@ -404,7 +427,9 @@ store using a simple file-like interface.
%package -n librados-devel
Summary: RADOS headers
Group: Development/Libraries
%if 0%{?suse_version}
Group: Development/Libraries/C and C++
%endif
License: LGPL-2.0
Requires: librados2 = %{version}-%{release}
Obsoletes: ceph-devel < %{version}-%{release}
@ -416,7 +441,9 @@ that use RADOS object store.
%package -n librgw2
Summary: RADOS gateway client library
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: System/Libraries/C and C++
%endif
License: LGPL-2.0
Requires: librados2 = %{version}-%{release}
%description -n librgw2
@ -425,7 +452,9 @@ This package provides a library implementation of the RADOS gateway
%package -n librgw-devel
Summary: RADOS gateway client library
Group: Development/Libraries
%if 0%{?suse_version}
Group: Development/Libraries/C and C++
%endif
License: LGPL-2.0
Requires: librados-devel = %{version}-%{release}
Requires: librgw2 = %{version}-%{release}
@ -437,7 +466,9 @@ that use RADOS gateway client library.
%package -n python-rgw
Summary: Python 2 libraries for the RADOS gateway
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
License: LGPL-2.0
Requires: librgw2 = %{version}-%{release}
Requires: python-rados = %{version}-%{release}
@ -448,7 +479,9 @@ gateway.
%package -n python%{python3_pkgversion}-rgw
Summary: Python 3 libraries for the RADOS gateway
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
License: LGPL-2.0
Requires: librgw2 = %{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{version}-%{release}
@ -458,7 +491,9 @@ gateway.
%package -n python-rados
Summary: Python 2 libraries for the RADOS object store
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
License: LGPL-2.0
Requires: librados2 = %{version}-%{release}
Obsoletes: python-ceph < %{version}-%{release}
@ -468,7 +503,9 @@ object store.
%package -n python%{python3_pkgversion}-rados
Summary: Python 3 libraries for the RADOS object store
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
License: LGPL-2.0
Requires: python%{python3_pkgversion}
Requires: librados2 = %{version}-%{release}
@ -478,7 +515,9 @@ object store.
%package -n libradosstriper1
Summary: RADOS striping interface
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: System/Libraries
%endif
License: LGPL-2.0
Requires: librados2 = %{version}-%{release}
%description -n libradosstriper1
@ -488,7 +527,9 @@ an interface very similar to the rados one.
%package -n libradosstriper-devel
Summary: RADOS striping interface headers
Group: Development/Libraries
%if 0%{?suse_version}
Group: Development/Libraries/C and C++
%endif
License: LGPL-2.0
Requires: libradosstriper1 = %{version}-%{release}
Requires: librados-devel = %{version}-%{release}
@ -501,7 +542,9 @@ that use RADOS striping interface.
%package -n librbd1
Summary: RADOS block device client library
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: System/Libraries
%endif
License: LGPL-2.0
Requires: librados2 = %{version}-%{release}
%if 0%{?rhel} || 0%{?fedora}
@ -515,7 +558,9 @@ shared library allowing applications to manage these block devices.
%package -n librbd-devel
Summary: RADOS block device headers
Group: Development/Libraries
%if 0%{?suse_version}
Group: Development/Libraries/C and C++
%endif
License: LGPL-2.0
Requires: librbd1 = %{version}-%{release}
Requires: librados-devel = %{version}-%{release}
@ -528,7 +573,9 @@ that use RADOS block device.
%package -n python-rbd
Summary: Python 2 libraries for the RADOS block device
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
License: LGPL-2.0
Requires: librbd1 = %{version}-%{release}
Requires: python-rados = %{version}-%{release}
@ -539,7 +586,9 @@ block device.
%package -n python%{python3_pkgversion}-rbd
Summary: Python 3 libraries for the RADOS block device
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
License: LGPL-2.0
Requires: librbd1 = %{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{version}-%{release}
@ -549,7 +598,9 @@ block device.
%package -n libcephfs2
Summary: Ceph distributed file system client library
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: System/Libraries
%endif
License: LGPL-2.0
%if 0%{?rhel} || 0%{?fedora}
Obsoletes: ceph-libs < %{version}-%{release}
@ -563,7 +614,9 @@ POSIX-like interface.
%package -n libcephfs-devel
Summary: Ceph distributed file system headers
Group: Development/Libraries
%if 0%{?suse_version}
Group: Development/Libraries/C and C++
%endif
License: LGPL-2.0
Requires: libcephfs2 = %{version}-%{release}
Requires: librados-devel = %{version}-%{release}
@ -576,10 +629,14 @@ that use Cephs distributed file system.
%package -n python-cephfs
Summary: Python 2 libraries for Ceph distributed file system
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
License: LGPL-2.0
Requires: libcephfs2 = %{version}-%{release}
Requires: python-rados = %{version}-%{release}
%if 0%{?suse_version}
Recommends: python-rados = %{version}-%{release}
%endif
Obsoletes: python-ceph < %{version}-%{release}
%description -n python-cephfs
This package contains Python 2 libraries for interacting with Cephs distributed
@ -587,7 +644,9 @@ file system.
%package -n python%{python3_pkgversion}-cephfs
Summary: Python 3 libraries for Ceph distributed file system
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
License: LGPL-2.0
Requires: libcephfs2 = %{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{version}-%{release}
@ -597,7 +656,9 @@ file system.
%package -n python%{python3_pkgversion}-ceph-argparse
Summary: Python 3 utility libraries for Ceph CLI
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
License: LGPL-2.0
%description -n python%{python3_pkgversion}-ceph-argparse
This package contains types and routines for Python 3 used by the Ceph CLI as
@ -608,7 +669,9 @@ 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 Environment/Libraries
%if 0%{?suse_version}
Group: System/Benchmark
%endif
License: LGPL-2.0
Requires: ceph-common
Requires: xmlstarlet
@ -620,7 +683,9 @@ This package contains Ceph benchmarks and test tools.
%package -n libcephfs_jni1
Summary: Java Native Interface library for CephFS Java bindings
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: System/Libraries/Java
%endif
License: LGPL-2.0
Requires: java
Requires: libcephfs2 = %{version}-%{release}
@ -630,7 +695,9 @@ bindings.
%package -n libcephfs_jni-devel
Summary: Development files for CephFS Java Native Interface library
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Libraries/Java
%endif
License: LGPL-2.0
Requires: java
Requires: libcephfs_jni1 = %{version}-%{release}
@ -643,7 +710,9 @@ library.
%package -n cephfs-java
Summary: Java libraries for the Ceph File System
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: System/Libraries/Java
%endif
License: LGPL-2.0
Requires: java
Requires: libcephfs_jni1 = %{version}-%{release}
@ -658,7 +727,9 @@ This package contains the Java libraries for the Ceph File System.
%package selinux
Summary: SELinux support for Ceph MON, OSD and MDS
Group: System Environment/Base
%if 0%{?suse_version}
Group: System/Filesystems
%endif
Requires: ceph-base = %{version}-%{release}
Requires: policycoreutils, libselinux-utils
Requires(post): selinux-policy-base >= %{_selinux_policy_version}, policycoreutils, gawk
@ -672,7 +743,9 @@ populated file-systems.
%package -n python-ceph-compat
Summary: Compatibility package for Cephs python libraries
Group: System Environment/Libraries
%if 0%{?suse_version}
Group: Development/Languages/Python
%endif
License: LGPL-2.0
Obsoletes: python-ceph
Requires: python-rados = %{version}-%{release}