From 77f580cf3350d85523a8d4582fb1f79569a844e8cdd5ad79de7701e39d40073e Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 4 Mar 2020 14:40:34 +0000 Subject: [PATCH] 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 --- ceph-15.1.0-1207-g89308cc4c6.tar.bz2 | 3 --- ceph-15.1.0-1521-gcdf35413a0.tar.bz2 | 3 +++ ceph-rpmlintrc | 8 +++++--- ceph-test.changes | 6 ++++++ ceph-test.spec | 10 +++++----- ceph.changes | 6 ++++++ ceph.spec | 15 +++++++-------- 7 files changed, 32 insertions(+), 19 deletions(-) delete mode 100644 ceph-15.1.0-1207-g89308cc4c6.tar.bz2 create mode 100644 ceph-15.1.0-1521-gcdf35413a0.tar.bz2 diff --git a/ceph-15.1.0-1207-g89308cc4c6.tar.bz2 b/ceph-15.1.0-1207-g89308cc4c6.tar.bz2 deleted file mode 100644 index 9f7c64e..0000000 --- a/ceph-15.1.0-1207-g89308cc4c6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f043a694a2f32bb0d390460d08185879308a1dae054c4c7cc1ec454e93622f2 -size 154962646 diff --git a/ceph-15.1.0-1521-gcdf35413a0.tar.bz2 b/ceph-15.1.0-1521-gcdf35413a0.tar.bz2 new file mode 100644 index 0000000..55553eb --- /dev/null +++ b/ceph-15.1.0-1521-gcdf35413a0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59333d6ed9be258d6c890e0a16d77f5ab48504305640ef9a85221dccd6f00a5b +size 154978336 diff --git a/ceph-rpmlintrc b/ceph-rpmlintrc index 5fc201c..7b7befa 100644 --- a/ceph-rpmlintrc +++ b/ceph-rpmlintrc @@ -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) diff --git a/ceph-test.changes b/ceph-test.changes index af4a6f1..9945052 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 2 14:19:37 UTC 2020 - Nathan Cutler + +- 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 diff --git a/ceph-test.spec b/ceph-test.spec index 5e64b65..657217c 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -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: diff --git a/ceph.changes b/ceph.changes index af4a6f1..9945052 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 2 14:19:37 UTC 2020 - Nathan Cutler + +- 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 diff --git a/ceph.spec b/ceph.spec index bcf249a..e2bf942 100644 --- a/ceph.spec +++ b/ceph.spec @@ -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 Ceph’s 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: