Accepting request 781552 from filesystems:ceph:octopus

15.1.0-1521

OBS-URL: https://build.opensuse.org/request/show/781552
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=262
This commit is contained in:
Nathan Cutler 2020-03-04 14:40:34 +00:00 committed by Git OBS Bridge
parent 1dd724de76
commit 77f580cf33
7 changed files with 32 additions and 19 deletions

View File

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

View File

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

View File

@ -78,14 +78,16 @@ addFilter("ceph-radosgw.*permissions-incorrect.*radosgw")
addFilter("ceph-radosgw.*permissions-incorrect-owner.*radosgw")
# ceph-common and ceph-radosgw are missing %set_permissions /usr/bin/radosgw in %post (WIP)
addFilter("ceph-common.*permissions-missing-postin.*radosgw")
addFilter("ceph-radosgw.*permissions-missing-postin.*radosgw")
addFilter("ceph-common.*permissions-missing-postin")
addFilter("ceph-radosgw.*permissions-missing-postin")
# ceph-radosgw is missing 'permissions' in PreReq - needs "PreReq: permissions" (WIP)
addFilter("ceph-radosgw.*permissions-missing-requires")
# ceph-common and ceph-radosgw are missing '%verify_permissions -e /usr/bin/radosgw' (WIP)
# ceph-common is missing '%verify_permissions -e /var/log/ceph' (WIP)
addFilter("ceph-common.*permissions-missing-verifyscript")
# ceph-radosgw is missing '%verify_permissions -e /usr/bin/radosgw' (WIP)
addFilter("ceph-radosgw.*permissions-missing-verifyscript")
# librgw2 calls exit() or _exit(), probably in a non-fork() context (WIP)

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 2 14:19:37 UTC 2020 - Nathan Cutler <ncutler@suse.com>
- Update to 15.1.0-1521-gcdf35413a0:
+ rebase on tip of upstream master, SHA1 28c08615e5c27e5a0986e3191ca4427cdc32f538
-------------------------------------------------------------------
Tue Feb 25 12:55:29 UTC 2020 - Nathan Cutler <ncutler@suse.com>

View File

@ -104,7 +104,7 @@
# main package definition
#################################################################################
Name: ceph-test
Version: 15.1.0.1207+g89308cc4c6
Version: 15.1.0.1521+gcdf35413a0
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -120,7 +120,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-15.1.0-1207-g89308cc4c6.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-15.1.0-1521-gcdf35413a0.tar.bz2
%if 0%{?suse_version}
Source96: checkin.sh
Source97: README-checkin.txt
@ -215,11 +215,13 @@ BuildRequires: libuuid-devel
BuildRequires: python%{python3_version_nodots}-bcrypt
BuildRequires: python%{python3_version_nodots}-nose
BuildRequires: python%{python3_version_nodots}-requests
BuildRequires: python%{python3_version_nodots}-dateutil
%else
BuildRequires: python%{python3_pkgversion}-bcrypt
BuildRequires: python%{python3_pkgversion}-nose
BuildRequires: python%{python3_pkgversion}-pecan
BuildRequires: python%{python3_pkgversion}-requests
BuildRequires: python%{python3_pkgversion}-dateutil
%endif
%if 0%{?rhel} == 7
BuildRequires: python%{python3_version_nodots}-six
@ -422,8 +424,6 @@ This package contains Ceph benchmarks and test tools.
%endif
%if 0%{?suse_version}
%endif
%if 0%{?rhel} == 7
%endif
%if 0%{?suse_version}
%endif
%if 0%{?rhel} == 7
@ -547,7 +547,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version}
%endif
%prep
%autosetup -p1 -n ceph-15.1.0-1207-g89308cc4c6
%autosetup -p1 -n ceph-15.1.0-1521-gcdf35413a0
%build
# LTO can be enabled as soon as the following GCC bug is fixed:

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 2 14:19:37 UTC 2020 - Nathan Cutler <ncutler@suse.com>
- Update to 15.1.0-1521-gcdf35413a0:
+ rebase on tip of upstream master, SHA1 28c08615e5c27e5a0986e3191ca4427cdc32f538
-------------------------------------------------------------------
Tue Feb 25 12:55:29 UTC 2020 - Nathan Cutler <ncutler@suse.com>

View File

@ -104,7 +104,7 @@
# main package definition
#################################################################################
Name: ceph
Version: 15.1.0.1207+g89308cc4c6
Version: 15.1.0.1521+gcdf35413a0
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -120,7 +120,7 @@ License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-
Group: System/Filesystems
%endif
URL: http://ceph.com/
Source0: %{?_remote_tarball_prefix}ceph-15.1.0-1207-g89308cc4c6.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-15.1.0-1521-gcdf35413a0.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -207,11 +207,13 @@ BuildRequires: libuuid-devel
BuildRequires: python%{python3_version_nodots}-bcrypt
BuildRequires: python%{python3_version_nodots}-nose
BuildRequires: python%{python3_version_nodots}-requests
BuildRequires: python%{python3_version_nodots}-dateutil
%else
BuildRequires: python%{python3_pkgversion}-bcrypt
BuildRequires: python%{python3_pkgversion}-nose
BuildRequires: python%{python3_pkgversion}-pecan
BuildRequires: python%{python3_pkgversion}-requests
BuildRequires: python%{python3_pkgversion}-dateutil
%endif
%if 0%{?rhel} == 7
BuildRequires: python%{python3_version_nodots}-six
@ -531,11 +533,6 @@ Requires: python%{python3_pkgversion}-PyJWT
Requires: python%{python3_pkgversion}-Routes
Requires: python%{python3_pkgversion}-Werkzeug
%endif
%if 0%{?rhel} == 7
Requires: pyOpenSSL
%else
Requires: python%{python3_pkgversion}-pyOpenSSL
%endif
%description mgr-dashboard
ceph-mgr-dashboard is a manager module, providing a web-based application
to monitor and manage many aspects of a Ceph cluster and related components.
@ -588,11 +585,13 @@ Requires: python%{python3_version_nodots}-bcrypt
Requires: python%{python3_version_nodots}-pyOpenSSL
Requires: python%{python3_version_nodots}-requests
Requires: python%{python3_version_nodots}-PyYAML
Requires: python%{python3_version_nodots}-dateutil
%else
Requires: python%{python3_pkgversion}-bcrypt
Requires: python%{python3_pkgversion}-pecan
Requires: python%{python3_pkgversion}-pyOpenSSL
Requires: python%{python3_pkgversion}-requests
Requires: python%{python3_pkgversion}-dateutil
%endif
%if 0%{?fedora} || 0%{?rhel} >= 8
Requires: python%{python3_pkgversion}-cherrypy
@ -1121,7 +1120,7 @@ This package provides Cephs default alerts for Prometheus.
# common
#################################################################################
%prep
%autosetup -p1 -n ceph-15.1.0-1207-g89308cc4c6
%autosetup -p1 -n ceph-15.1.0-1521-gcdf35413a0
%build
# LTO can be enabled as soon as the following GCC bug is fixed: