From aa565fb4ee606d2beee250b184fd26c0d55e0ea5d1cd6ee0ba4e04f7847d9680 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 12 Apr 2021 08:49:40 +0000 Subject: [PATCH] Accepting request 884583 from filesystems:ceph:pacific 16.2.0 OBS-URL: https://build.opensuse.org/request/show/884583 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=292 --- ceph-16.1.0-1217-g8e1da7347e.tar.bz2 | 3 --- ceph-16.2.0-91-g24bd0c4acf.tar.bz2 | 3 +++ ceph-test.changes | 13 +++++++++++++ ceph-test.spec | 16 ++++++++++------ ceph.changes | 13 +++++++++++++ ceph.spec | 16 ++++++++++------ 6 files changed, 49 insertions(+), 15 deletions(-) delete mode 100644 ceph-16.1.0-1217-g8e1da7347e.tar.bz2 create mode 100644 ceph-16.2.0-91-g24bd0c4acf.tar.bz2 diff --git a/ceph-16.1.0-1217-g8e1da7347e.tar.bz2 b/ceph-16.1.0-1217-g8e1da7347e.tar.bz2 deleted file mode 100644 index 7fcacf7..0000000 --- a/ceph-16.1.0-1217-g8e1da7347e.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2a004d48715af96395c38a510e1e686aa5f1125e74238c9e3c4a091b254ceb8 -size 126624817 diff --git a/ceph-16.2.0-91-g24bd0c4acf.tar.bz2 b/ceph-16.2.0-91-g24bd0c4acf.tar.bz2 new file mode 100644 index 0000000..525b6e6 --- /dev/null +++ b/ceph-16.2.0-91-g24bd0c4acf.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b737323f1e7d1ffd0cddf8913b8659d4b4266506eeb56f81cbbf2f109430806c +size 126561536 diff --git a/ceph-test.changes b/ceph-test.changes index 59ecc53..59cf85e 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Apr 8 12:48:11 UTC 2021 - Nathan Cutler + +- Update to 16.2.0-91-g24bd0c4acf: + + rebase on top of upstream pacific SHA1 4cbaf866034715d053e6259dcd5bd8e4e1d1e1ed + +------------------------------------------------------------------- +Thu Apr 1 15:10:47 UTC 2021 - Nathan Cutler + +- Update to 16.2.0-31-g5922b2b9c1: + + rebase on top of upstream v16.2.0 (first stable release in Pacific series) + see https://ceph.io/releases/v16-2-0-pacific-released/ + ------------------------------------------------------------------- Fri Mar 26 10:14:59 UTC 2021 - Nathan Cutler diff --git a/ceph-test.spec b/ceph-test.spec index ead1f45..b1b09da 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -25,7 +25,7 @@ %bcond_with cmake_verbose_logging %bcond_without ceph_test_package %bcond_with minimal_debugging_information -%ifarch s390 s390x +%ifarch s390 %bcond_with tcmalloc %else %bcond_without tcmalloc @@ -123,7 +123,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 16.1.0.1217+g8e1da7347e +Version: 16.2.0.91+g24bd0c4acf Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -139,7 +139,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-16.1.0-1217-g8e1da7347e.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-16.2.0-91-g24bd0c4acf.tar.bz2 %if 0%{?suse_version} Source94: ceph-rpmlintrc Source95: checkin.sh @@ -181,7 +181,11 @@ BuildRequires: gcc-c++ %endif BuildRequires: gdbm %if 0%{with tcmalloc} -%if 0%{?fedora} || 0%{?rhel} +# libprofiler did not build on ppc64le until 2.7.90 +%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: gperftools-devel >= 2.7.90 +%endif +%if 0%{?rhel} && 0%{?rhel} < 8 BuildRequires: gperftools-devel >= 2.6.1 %endif %if 0%{?suse_version} @@ -409,7 +413,7 @@ This package contains Ceph benchmarks and test tools. %endif %if 0%{with selinux} %endif -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 8 %if 0%{with tcmalloc} %endif %endif @@ -586,7 +590,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-16.1.0-1217-g8e1da7347e +%autosetup -p1 -n ceph-16.2.0-91-g24bd0c4acf %build # LTO can be enabled as soon as the following GCC bug is fixed: diff --git a/ceph.changes b/ceph.changes index 59ecc53..59cf85e 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Apr 8 12:48:11 UTC 2021 - Nathan Cutler + +- Update to 16.2.0-91-g24bd0c4acf: + + rebase on top of upstream pacific SHA1 4cbaf866034715d053e6259dcd5bd8e4e1d1e1ed + +------------------------------------------------------------------- +Thu Apr 1 15:10:47 UTC 2021 - Nathan Cutler + +- Update to 16.2.0-31-g5922b2b9c1: + + rebase on top of upstream v16.2.0 (first stable release in Pacific series) + see https://ceph.io/releases/v16-2-0-pacific-released/ + ------------------------------------------------------------------- Fri Mar 26 10:14:59 UTC 2021 - Nathan Cutler diff --git a/ceph.spec b/ceph.spec index 422794b..80478bd 100644 --- a/ceph.spec +++ b/ceph.spec @@ -25,7 +25,7 @@ %bcond_with cmake_verbose_logging %bcond_with ceph_test_package %bcond_with minimal_debugging_information -%ifarch s390 s390x +%ifarch s390 %bcond_with tcmalloc %else %bcond_without tcmalloc @@ -123,7 +123,7 @@ # main package definition ################################################################################# Name: ceph -Version: 16.1.0.1217+g8e1da7347e +Version: 16.2.0.91+g24bd0c4acf Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -139,7 +139,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-16.1.0-1217-g8e1da7347e.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-16.2.0-91-g24bd0c4acf.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64le s390x @@ -171,7 +171,11 @@ BuildRequires: gcc-c++ %endif BuildRequires: gdbm %if 0%{with tcmalloc} -%if 0%{?fedora} || 0%{?rhel} +# libprofiler did not build on ppc64le until 2.7.90 +%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: gperftools-devel >= 2.7.90 +%endif +%if 0%{?rhel} && 0%{?rhel} < 8 BuildRequires: gperftools-devel >= 2.6.1 %endif %if 0%{?suse_version} @@ -422,7 +426,7 @@ Requires: python%{python3_pkgversion}-setuptools Requires: util-linux Requires: xfsprogs Requires: which -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 8 # The following is necessary due to tracker 36508 and can be removed once the # associated upstream bugs are resolved. %if 0%{with tcmalloc} @@ -1202,7 +1206,7 @@ This package provides Ceph default alerts for Prometheus. # common ################################################################################# %prep -%autosetup -p1 -n ceph-16.1.0-1217-g8e1da7347e +%autosetup -p1 -n ceph-16.2.0-91-g24bd0c4acf %build # LTO can be enabled as soon as the following GCC bug is fixed: