From 6e5d78a3ca7beee8f7ac4171d7f7e993cc7fcbd7a94fb57435348fbef66a4d43 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 30 Apr 2019 09:44:22 +0000 Subject: [PATCH] Accepting request 699581 from filesystems:ceph:nautilus 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 --- ceph-14.2.0-465-gdfed19b089.tar.bz2 | 3 --- ceph-14.2.1-316-g0d114eabe2.tar.bz2 | 3 +++ ceph-test.changes | 15 +++++++++++++++ ceph-test.spec | 19 +++++++----------- ceph.changes | 15 +++++++++++++++ ceph.spec | 30 +++++++++++++++++------------ 6 files changed, 58 insertions(+), 27 deletions(-) delete mode 100644 ceph-14.2.0-465-gdfed19b089.tar.bz2 create mode 100644 ceph-14.2.1-316-g0d114eabe2.tar.bz2 diff --git a/ceph-14.2.0-465-gdfed19b089.tar.bz2 b/ceph-14.2.0-465-gdfed19b089.tar.bz2 deleted file mode 100644 index 8ad1a5c..0000000 --- a/ceph-14.2.0-465-gdfed19b089.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40bf77a00f8aa05f6ba8ed8f50137fa09cb61698bd216932fd2c579de628e8e3 -size 96766484 diff --git a/ceph-14.2.1-316-g0d114eabe2.tar.bz2 b/ceph-14.2.1-316-g0d114eabe2.tar.bz2 new file mode 100644 index 0000000..2ef4246 --- /dev/null +++ b/ceph-14.2.1-316-g0d114eabe2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1705475087328dabca7ad6bc47108b9c7bedb5f5f9c31c657a30daa5f6e7ed16 +size 96850499 diff --git a/ceph-test.changes b/ceph-test.changes index 5b9be48..8d2ece3 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Apr 30 09:12:48 UTC 2019 - Nathan Cutler + +- 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 + +- 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 diff --git a/ceph-test.spec b/ceph-test.spec index 0072620..6065ecf 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -85,6 +85,7 @@ %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?python3_pkgversion: %global python3_pkgversion 3} +%{!?python3_version: %global python3_version 3} # define _python_buildid macro which will expand to the empty string when # building with python2 %global _python_buildid %{?_defined_if_python2_absent:%{python3_pkgversion}} @@ -99,7 +100,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.2.0.465+gdfed19b089 +Version: 14.2.1.316+g0d114eabe2 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} 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 %endif 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} Source96: checkin.sh Source97: README-checkin.txt @@ -267,15 +268,9 @@ BuildRequires: redhat-lsb-core %if 0%{with python2} BuildRequires: python2-Cython %endif -%if 0%{?rhel} == 7 -BuildRequires: python34-devel -BuildRequires: python34-setuptools -BuildRequires: python34-Cython -%else -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-Cython -%endif +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-Cython BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-sphinx BuildRequires: lz4-devel >= 1.7 @@ -500,7 +495,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-14.2.0-465-gdfed19b089 +%autosetup -p1 -n ceph-14.2.1-316-g0d114eabe2 %build diff --git a/ceph.changes b/ceph.changes index 5b9be48..8d2ece3 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Apr 30 09:12:48 UTC 2019 - Nathan Cutler + +- 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 + +- 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 diff --git a/ceph.spec b/ceph.spec index 9451f5b..71a1d36 100644 --- a/ceph.spec +++ b/ceph.spec @@ -85,6 +85,7 @@ %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d} %{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create} %{!?python3_pkgversion: %global python3_pkgversion 3} +%{!?python3_version: %global python3_version 3} # define _python_buildid macro which will expand to the empty string when # building with python2 %global _python_buildid %{?_defined_if_python2_absent:%{python3_pkgversion}} @@ -99,7 +100,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.2.0.465+gdfed19b089 +Version: 14.2.1.316+g0d114eabe2 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} 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 %endif 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} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -259,15 +260,9 @@ BuildRequires: redhat-lsb-core %if 0%{with python2} BuildRequires: python2-Cython %endif -%if 0%{?rhel} == 7 -BuildRequires: python34-devel -BuildRequires: python34-setuptools -BuildRequires: python34-Cython -%else -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-Cython -%endif +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-Cython BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-sphinx BuildRequires: lz4-devel >= 1.7 @@ -724,6 +719,7 @@ Group: Development/Libraries/Python %endif Requires: librgw2 = %{_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 This package contains Python 3 libraries for interacting with Cephs RADOS gateway. @@ -748,6 +744,9 @@ Group: Development/Libraries/Python %endif Requires: python%{python3_pkgversion} 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 This package contains Python 3 libraries for interacting with Cephs RADOS object store. @@ -834,6 +833,9 @@ Group: Development/Libraries/Python %endif Requires: librbd1 = %{_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 This package contains Python 3 libraries for interacting with Cephs RADOS block device. @@ -891,6 +893,9 @@ Group: Development/Libraries/Python Requires: libcephfs2 = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-rados = %{_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 This package contains Python 3 libraries for interacting with Cephs distributed file system. @@ -913,6 +918,7 @@ Summary: Python 3 utility libraries for Ceph CLI %if 0%{?suse_version} Group: Development/Libraries/Python %endif +Provides: python3-ceph-argparse = %{_epoch_prefix}%{version}-%{release} %description -n python%{python3_pkgversion}-ceph-argparse 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 @@ -1051,7 +1057,7 @@ integrated with the Ceph Manager Dashboard web UI. # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.2.0-465-gdfed19b089 +%autosetup -p1 -n ceph-14.2.1-316-g0d114eabe2 %build