From b3b96aae70d43d1eb5377b530ae4ccf238aeeea3f5bc0713c66b7f6b26bf833d Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 28 Feb 2019 09:57:40 +0000 Subject: [PATCH] Accepting request 680072 from filesystems:ceph:nautilus 14.1.0.402 OBS-URL: https://build.opensuse.org/request/show/680072 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=209 --- ceph-14.1.0-397-g83233298c9.tar.bz2 | 3 --- ceph-14.1.0-402-ga396e8bf3b.tar.bz2 | 3 +++ ceph-test.changes | 2 +- ceph-test.spec | 8 +++++--- ceph.changes | 2 +- ceph.spec | 11 ++++++++--- 6 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 ceph-14.1.0-397-g83233298c9.tar.bz2 create mode 100644 ceph-14.1.0-402-ga396e8bf3b.tar.bz2 diff --git a/ceph-14.1.0-397-g83233298c9.tar.bz2 b/ceph-14.1.0-397-g83233298c9.tar.bz2 deleted file mode 100644 index 7d8bb39..0000000 --- a/ceph-14.1.0-397-g83233298c9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b36f6c3f7bb042b95acb6ed8bc5a3ad87ae9e2fa7c540a521be23d6c0ca9d3d4 -size 95822470 diff --git a/ceph-14.1.0-402-ga396e8bf3b.tar.bz2 b/ceph-14.1.0-402-ga396e8bf3b.tar.bz2 new file mode 100644 index 0000000..9729ca5 --- /dev/null +++ b/ceph-14.1.0-402-ga396e8bf3b.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:704028e97fa4710123d85bce3d6e67c0adb4db2a40c698a45047d32d44cd8656 +size 95818578 diff --git a/ceph-test.changes b/ceph-test.changes index 683a504..bd44aaa 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sun Feb 24 10:39:14 UTC 2019 - ncutler@suse.com -- Update to 14.1.0-397-g83233298c9: +- Update to 14.1.0-402-ga396e8bf3b: + rebase on top of upstream master branch, SHA1 1f909bc88be501e58cfbe1bab55efc20de10fa8d * upstream v14.1.0 (Nautilus RC1) release + see draft release notes: https://github.com/ceph/ceph/pull/26598 diff --git a/ceph-test.spec b/ceph-test.spec index 7ecf436..a926ea3 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -97,7 +97,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.1.0.397+g83233298c9 +Version: 14.1.0.402+ga396e8bf3b Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -113,7 +113,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 %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-14.1.0-397-g83233298c9.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.1.0-402-ga396e8bf3b.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -364,6 +364,8 @@ 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%{?fedora} || 0%{?rhel} @@ -489,7 +491,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-14.1.0-397-g83233298c9 +%autosetup -p1 -n ceph-14.1.0-402-ga396e8bf3b %build diff --git a/ceph.changes b/ceph.changes index 683a504..bd44aaa 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sun Feb 24 10:39:14 UTC 2019 - ncutler@suse.com -- Update to 14.1.0-397-g83233298c9: +- Update to 14.1.0-402-ga396e8bf3b: + rebase on top of upstream master branch, SHA1 1f909bc88be501e58cfbe1bab55efc20de10fa8d * upstream v14.1.0 (Nautilus RC1) release + see draft release notes: https://github.com/ceph/ceph/pull/26598 diff --git a/ceph.spec b/ceph.spec index d6bec4d..5a254c4 100644 --- a/ceph.spec +++ b/ceph.spec @@ -97,7 +97,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.1.0.397+g83233298c9 +Version: 14.1.0.402+ga396e8bf3b Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -113,7 +113,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 %endif URL: http://ceph.com/ -Source0: %{?_remote_tarball_prefix}ceph-14.1.0-397-g83233298c9.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.1.0-402-ga396e8bf3b.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -450,6 +450,11 @@ Recommends: ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release Recommends: ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release} %endif +%if 0%{?rhel} == 7 +Requires: pyOpenSSL +%else +Requires: python%{_python_buildid}-pyOpenSSL +%endif %description mgr ceph-mgr enables python modules that provide services (such as the REST module derived from Calamari) and expose CLI hooks. ceph-mgr gathers @@ -1032,7 +1037,7 @@ integrated with the Ceph Manager Dashboard web UI. # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.1.0-397-g83233298c9 +%autosetup -p1 -n ceph-14.1.0-402-ga396e8bf3b %build