From a35eece52cebb40088b74015edcc89472ca8b9c20b735f8c86d7783f725135c2 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 16 Jan 2019 11:51:37 +0000 Subject: [PATCH] Accepting request 666460 from filesystems:ceph:nautilus - Update to 14.0.1-2789-g6c941e4d76: + rebase on top of upstream master branch, SHA1 c70a3d8e30be84ea8db41e7329ed1577aeee9ab9 * MON now supports Kerberos authentication * MGR now works with Cython >= 0.29 * spec: add xmlsec1 dependency for dashboard make check * spec: change rbd-mirror and ceph-radosgw runtime dependency from ceph-common to ceph-base to address http://tracker.ceph.com/issues/37620 OBS-URL: https://build.opensuse.org/request/show/666460 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=204 --- ceph-14.0.1-1555-g42662f72f4.tar.bz2 | 3 --- ceph-14.0.1-2789-g6c941e4d76.tar.bz2 | 3 +++ ceph-test.changes | 11 +++++++++++ ceph-test.spec | 19 ++++++++++++------- ceph.changes | 11 +++++++++++ ceph.spec | 23 ++++++++++++++--------- 6 files changed, 51 insertions(+), 19 deletions(-) delete mode 100644 ceph-14.0.1-1555-g42662f72f4.tar.bz2 create mode 100644 ceph-14.0.1-2789-g6c941e4d76.tar.bz2 diff --git a/ceph-14.0.1-1555-g42662f72f4.tar.bz2 b/ceph-14.0.1-1555-g42662f72f4.tar.bz2 deleted file mode 100644 index 4566580..0000000 --- a/ceph-14.0.1-1555-g42662f72f4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aed2f9cb42fbd3398682cfb2c16b1cf5942fe9e95ded60f60ee8ee63833f61f2 -size 95388319 diff --git a/ceph-14.0.1-2789-g6c941e4d76.tar.bz2 b/ceph-14.0.1-2789-g6c941e4d76.tar.bz2 new file mode 100644 index 0000000..0503c2b --- /dev/null +++ b/ceph-14.0.1-2789-g6c941e4d76.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f81bb51113c3f9d71470c831197c5e99d87d2c0e41247616e7daef1ec10f0a9 +size 95566321 diff --git a/ceph-test.changes b/ceph-test.changes index 3c65c94..44bea01 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jan 14 13:16:35 UTC 2019 - ncutler@suse.com + +- Update to 14.0.1-2789-g6c941e4d76: + + rebase on top of upstream master branch, SHA1 c70a3d8e30be84ea8db41e7329ed1577aeee9ab9 + * MON now supports Kerberos authentication + * MGR now works with Cython >= 0.29 + * spec: add xmlsec1 dependency for dashboard make check + * spec: change rbd-mirror and ceph-radosgw runtime dependency + from ceph-common to ceph-base to address http://tracker.ceph.com/issues/37620 + ------------------------------------------------------------------- Tue Dec 11 14:34:39 UTC 2018 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index c860a84..f8df416 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -96,7 +96,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.0.1.1555+g42662f72f4 +Version: 14.0.1.2789+g6c941e4d76 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -112,7 +112,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.0.1-1555-g42662f72f4.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.0.1-2789-g6c941e4d76.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -235,9 +235,11 @@ BuildRequires: keyutils-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release BuildRequires: openldap2-devel +BuildRequires: krb5 +BuildRequires: krb5-devel BuildRequires: cunit-devel BuildRequires: python%{_python_buildid}-base -BuildRequires: python%{_python_buildid}-Cython < 0.29 +BuildRequires: python%{_python_buildid}-Cython BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: rdma-core-devel @@ -252,10 +254,11 @@ BuildRequires: keyutils-libs-devel BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel BuildRequires: openldap-devel +BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: CUnit-devel BuildRequires: redhat-lsb-core -BuildRequires: Cython < 0.29 +BuildRequires: Cython BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-sphinx BuildRequires: lz4-devel >= 1.7 @@ -264,11 +267,11 @@ BuildRequires: lz4-devel >= 1.7 %if 0%{?rhel} BuildRequires: python34-devel BuildRequires: python34-setuptools -BuildRequires: python34-Cython < 0.29 +BuildRequires: python34-Cython %else BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-Cython < 0.29 +BuildRequires: python3-Cython %endif # distro-conditional make check dependencies %if 0%{with make_check} @@ -278,6 +281,7 @@ BuildRequires: python%{_python_buildid}-jwt BuildRequires: python%{_python_buildid}-routes BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: python%{_python_buildid}-bcrypt +BuildRequires: xmlsec1 %endif %if 0%{?suse_version} BuildRequires: python%{_python_buildid}-CherryPy @@ -286,6 +290,7 @@ BuildRequires: python%{_python_buildid}-Routes BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: python%{_python_buildid}-bcrypt +BuildRequires: libxmlsec1-1 %endif %endif # lttng and babeltrace for rbd-replay-prep @@ -468,7 +473,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-14.0.1-1555-g42662f72f4 +%autosetup -p1 -n ceph-14.0.1-2789-g6c941e4d76 %build diff --git a/ceph.changes b/ceph.changes index 3c65c94..44bea01 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jan 14 13:16:35 UTC 2019 - ncutler@suse.com + +- Update to 14.0.1-2789-g6c941e4d76: + + rebase on top of upstream master branch, SHA1 c70a3d8e30be84ea8db41e7329ed1577aeee9ab9 + * MON now supports Kerberos authentication + * MGR now works with Cython >= 0.29 + * spec: add xmlsec1 dependency for dashboard make check + * spec: change rbd-mirror and ceph-radosgw runtime dependency + from ceph-common to ceph-base to address http://tracker.ceph.com/issues/37620 + ------------------------------------------------------------------- Tue Dec 11 14:34:39 UTC 2018 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index db0aa5b..04a7aae 100644 --- a/ceph.spec +++ b/ceph.spec @@ -96,7 +96,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.0.1.1555+g42662f72f4 +Version: 14.0.1.2789+g6c941e4d76 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -112,7 +112,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.0.1-1555-g42662f72f4.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.0.1-2789-g6c941e4d76.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -227,9 +227,11 @@ BuildRequires: keyutils-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release BuildRequires: openldap2-devel +BuildRequires: krb5 +BuildRequires: krb5-devel BuildRequires: cunit-devel BuildRequires: python%{_python_buildid}-base -BuildRequires: python%{_python_buildid}-Cython < 0.29 +BuildRequires: python%{_python_buildid}-Cython BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: rdma-core-devel @@ -244,10 +246,11 @@ BuildRequires: keyutils-libs-devel BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel BuildRequires: openldap-devel +BuildRequires: krb5-devel BuildRequires: openssl-devel BuildRequires: CUnit-devel BuildRequires: redhat-lsb-core -BuildRequires: Cython < 0.29 +BuildRequires: Cython BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-sphinx BuildRequires: lz4-devel >= 1.7 @@ -256,11 +259,11 @@ BuildRequires: lz4-devel >= 1.7 %if 0%{?rhel} BuildRequires: python34-devel BuildRequires: python34-setuptools -BuildRequires: python34-Cython < 0.29 +BuildRequires: python34-Cython %else BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-Cython < 0.29 +BuildRequires: python3-Cython %endif # distro-conditional make check dependencies %if 0%{with make_check} @@ -270,6 +273,7 @@ BuildRequires: python%{_python_buildid}-jwt BuildRequires: python%{_python_buildid}-routes BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: python%{_python_buildid}-bcrypt +BuildRequires: xmlsec1 %endif %if 0%{?suse_version} BuildRequires: python%{_python_buildid}-CherryPy @@ -278,6 +282,7 @@ BuildRequires: python%{_python_buildid}-Routes BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: python%{_python_buildid}-bcrypt +BuildRequires: libxmlsec1-1 %endif %endif # lttng and babeltrace for rbd-replay-prep @@ -480,7 +485,7 @@ Summary: Ceph daemon for mirroring RBD images %if 0%{?suse_version} Group: System/Filesystems %endif -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: libradospp1 = %{_epoch_prefix}%{version}-%{release} %description -n rbd-mirror Daemon for mirroring RBD images between Ceph clusters, streaming @@ -501,7 +506,7 @@ Summary: Rados REST gateway %if 0%{?suse_version} Group: System/Filesystems %endif -Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} %if 0%{with selinux} Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} %endif @@ -967,7 +972,7 @@ integrated with the Ceph Manager Dashboard web UI. # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.0.1-1555-g42662f72f4 +%autosetup -p1 -n ceph-14.0.1-2789-g6c941e4d76 %build