pool/ceph
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 699581 from filesystems:ceph:nautilus

Browse Source 
v14.2.1

OBS-URL: https://build.opensuse.org/request/show/699581
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=220
This commit is contained in:
Nathan Cutler 2019-04-30 09:44:22 +00:00 committed by Git OBS Bridge
parent 5705279863
commit 6e5d78a3ca
6 changed files with 58 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-14.2.0-465-gdfed19b089.tar.bz2
View File

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

3
ceph-14.2.1-316-g0d114eabe2.tar.bz2 Normal file
View File

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

15
ceph-test.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Apr 30 09:12:48 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 14.2.1-316-g0d114eabe2:
+ Upstream v14.2.1 release
draft release notes: https://github.com/ceph/ceph/pull/27793
-------------------------------------------------------------------
Thu Apr 18 16:15:53 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 14.2.0-636-g19cfb53b0c:
+ rebase on top of upstream nautilus branch, SHA1 d947e804dd316c89c28d25948947927fa290e227
+ downstream branding no longer displays Ceph logo in error popup (bsc#1131984)
+ mgr: make run-tox.sh scripts more robust (jsc#SES-478)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 9 08:49:36 UTC 2019 - ncutler@suse.com Tue Apr 9 08:49:36 UTC 2019 - ncutler@suse.com

19
ceph-test.spec
View File

@ -85,6 +85,7 @@
%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
%{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
%{!?python3_pkgversion: %global python3_pkgversion 3} %{!?python3_pkgversion: %global python3_pkgversion 3}
%{!?python3_version: %global python3_version 3}
# define _python_buildid macro which will expand to the empty string when # define _python_buildid macro which will expand to the empty string when
# building with python2 # building with python2
%global _python_buildid %{?_defined_if_python2_absent:%{python3_pkgversion}} %global _python_buildid %{?_defined_if_python2_absent:%{python3_pkgversion}}
@ -99,7 +100,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 14.2.0.465+gdfed19b089 Version: 14.2.1.316+g0d114eabe2
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -115,7 +116,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
Group: System/Filesystems Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-14.2.0-465-gdfed19b089.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-14.2.1-316-g0d114eabe2.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -267,15 +268,9 @@ BuildRequires: redhat-lsb-core
%if 0%{with python2} %if 0%{with python2}
BuildRequires: python2-Cython BuildRequires: python2-Cython
%endif %endif
%if 0%{?rhel} == 7 BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python34-devel BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python34-setuptools BuildRequires: python%{python3_pkgversion}-Cython
BuildRequires: python34-Cython
%else
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-Cython
%endif
BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-prettytable
BuildRequires: python%{_python_buildid}-sphinx BuildRequires: python%{_python_buildid}-sphinx
BuildRequires: lz4-devel >= 1.7 BuildRequires: lz4-devel >= 1.7
@ -500,7 +495,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-14.2.0-465-gdfed19b089 %autosetup -p1 -n ceph-14.2.1-316-g0d114eabe2
%build %build

15
ceph.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Apr 30 09:12:48 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 14.2.1-316-g0d114eabe2:
+ Upstream v14.2.1 release
draft release notes: https://github.com/ceph/ceph/pull/27793
-------------------------------------------------------------------
Thu Apr 18 16:15:53 UTC 2019 - Nathan Cutler <ncutler@suse.com>
- Update to 14.2.0-636-g19cfb53b0c:
+ rebase on top of upstream nautilus branch, SHA1 d947e804dd316c89c28d25948947927fa290e227
+ downstream branding no longer displays Ceph logo in error popup (bsc#1131984)
+ mgr: make run-tox.sh scripts more robust (jsc#SES-478)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 9 08:49:36 UTC 2019 - ncutler@suse.com Tue Apr 9 08:49:36 UTC 2019 - ncutler@suse.com

30
ceph.spec
View File

@ -85,6 +85,7 @@
%{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
%{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
%{!?python3_pkgversion: %global python3_pkgversion 3} %{!?python3_pkgversion: %global python3_pkgversion 3}
%{!?python3_version: %global python3_version 3}
# define _python_buildid macro which will expand to the empty string when # define _python_buildid macro which will expand to the empty string when
# building with python2 # building with python2
%global _python_buildid %{?_defined_if_python2_absent:%{python3_pkgversion}} %global _python_buildid %{?_defined_if_python2_absent:%{python3_pkgversion}}
@ -99,7 +100,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 14.2.0.465+gdfed19b089 Version: 14.2.1.316+g0d114eabe2
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -115,7 +116,7 @@ License: LGPL-2.1 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and
Group: System/Filesystems Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-14.2.0-465-gdfed19b089.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-14.2.1-316-g0d114eabe2.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
# _insert_obs_source_lines_here # _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -259,15 +260,9 @@ BuildRequires: redhat-lsb-core
%if 0%{with python2} %if 0%{with python2}
BuildRequires: python2-Cython BuildRequires: python2-Cython
%endif %endif
%if 0%{?rhel} == 7 BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python34-devel BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python34-setuptools BuildRequires: python%{python3_pkgversion}-Cython
BuildRequires: python34-Cython
%else
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-Cython
%endif
BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-prettytable
BuildRequires: python%{_python_buildid}-sphinx BuildRequires: python%{_python_buildid}-sphinx
BuildRequires: lz4-devel >= 1.7 BuildRequires: lz4-devel >= 1.7
@ -724,6 +719,7 @@ Group: Development/Libraries/Python
%endif %endif
Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
Provides: python3-rgw = %{_epoch_prefix}%{version}-%{release}
%description -n python%{python3_pkgversion}-rgw %description -n python%{python3_pkgversion}-rgw
This package contains Python 3 libraries for interacting with Cephs RADOS This package contains Python 3 libraries for interacting with Cephs RADOS
gateway. gateway.
@ -748,6 +744,9 @@ Group: Development/Libraries/Python
%endif %endif
Requires: python%{python3_pkgversion} Requires: python%{python3_pkgversion}
Requires: librados2 = %{_epoch_prefix}%{version}-%{release} Requires: librados2 = %{_epoch_prefix}%{version}-%{release}
Provides: python3-rados = %{_epoch_prefix}%{version}-%{release}
Provides: python-rados = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-rados < %{_epoch_prefix}%{version}-%{release}
%description -n python%{python3_pkgversion}-rados %description -n python%{python3_pkgversion}-rados
This package contains Python 3 libraries for interacting with Cephs RADOS This package contains Python 3 libraries for interacting with Cephs RADOS
object store. object store.
@ -834,6 +833,9 @@ Group: Development/Libraries/Python
%endif %endif
Requires: librbd1 = %{_epoch_prefix}%{version}-%{release} Requires: librbd1 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
Provides: python3-rbd = %{_epoch_prefix}%{version}-%{release}
Provides: python-rbd = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-rbd < %{_epoch_prefix}%{version}-%{release}
%description -n python%{python3_pkgversion}-rbd %description -n python%{python3_pkgversion}-rbd
This package contains Python 3 libraries for interacting with Cephs RADOS This package contains Python 3 libraries for interacting with Cephs RADOS
block device. block device.
@ -891,6 +893,9 @@ Group: Development/Libraries/Python
Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-rados = %{_epoch_prefix}%{version}-%{release}
Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
Provides: python3-cephfs = %{_epoch_prefix}%{version}-%{release}
Provides: python-cephfs = %{_epoch_prefix}%{version}-%{release}
Obsoletes: python-cephfs < %{_epoch_prefix}%{version}-%{release}
%description -n python%{python3_pkgversion}-cephfs %description -n python%{python3_pkgversion}-cephfs
This package contains Python 3 libraries for interacting with Cephs distributed This package contains Python 3 libraries for interacting with Cephs distributed
file system. file system.
@ -913,6 +918,7 @@ Summary: Python 3 utility libraries for Ceph CLI
%if 0%{?suse_version} %if 0%{?suse_version}
Group: Development/Libraries/Python Group: Development/Libraries/Python
%endif %endif
Provides: python3-ceph-argparse = %{_epoch_prefix}%{version}-%{release}
%description -n python%{python3_pkgversion}-ceph-argparse %description -n python%{python3_pkgversion}-ceph-argparse
This package contains types and routines for Python 3 used by the Ceph CLI as This package contains types and routines for Python 3 used by the Ceph CLI as
well as the RESTful interface. These have to do with querying the daemons for well as the RESTful interface. These have to do with querying the daemons for
@ -1051,7 +1057,7 @@ integrated with the Ceph Manager Dashboard web UI.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-14.2.0-465-gdfed19b089 %autosetup -p1 -n ceph-14.2.1-316-g0d114eabe2
%build %build