diff --git a/ceph-14.0.0-4389-g4c34d15e48.tar.bz2 b/ceph-14.0.0-4389-g4c34d15e48.tar.bz2 deleted file mode 100644 index c4e570e..0000000 --- a/ceph-14.0.0-4389-g4c34d15e48.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00a76313cd051d9a011a66b43c439f182139c6ccf242c6e6148bbf67441f39b9 -size 89814480 diff --git a/ceph-14.0.1-268-g3a87f182b7.tar.bz2 b/ceph-14.0.1-268-g3a87f182b7.tar.bz2 new file mode 100644 index 0000000..ff1c809 --- /dev/null +++ b/ceph-14.0.1-268-g3a87f182b7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57db22afac18031679afa89d029db6a4d89f9683952013d8d79c3b601f4fd64b +size 89869977 diff --git a/ceph-test.changes b/ceph-test.changes index dd660df..a746e21 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Nov 28 15:50:12 UTC 2018 - ncutler@suse.com + +- spec file: make ceph-common provide/obsolete libradosstriper1 + (in SES5 ceph-common requires libradosstriper1 with exact version match, + while in SES6 there is no libradosstriper1 at all) + +------------------------------------------------------------------- +Tue Nov 6 21:46:19 UTC 2018 - ncutler@suse.com + +- Update to v14.0.1-154-g7588072b82: + + based on upstream nautilus 5f51cd286b747b1729006a5b98fb08b1b646237a + (v14.0.1 release) + ------------------------------------------------------------------- Mon Oct 29 14:02:13 UTC 2018 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 1f16bcb..eca46aa 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -89,7 +89,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.0.0.4389+g4c34d15e48 +Version: 14.0.1.268+g3a87f182b7 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -105,7 +105,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.0-4389-g4c34d15e48.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.0.1-268-g3a87f182b7.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -451,7 +451,7 @@ This package contains Ceph benchmarks and test tools. %endif %endif %prep -%autosetup -p1 -n ceph-14.0.0-4389-g4c34d15e48 +%autosetup -p1 -n ceph-14.0.1-268-g3a87f182b7 %build diff --git a/ceph.changes b/ceph.changes index dd660df..a746e21 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Nov 28 15:50:12 UTC 2018 - ncutler@suse.com + +- spec file: make ceph-common provide/obsolete libradosstriper1 + (in SES5 ceph-common requires libradosstriper1 with exact version match, + while in SES6 there is no libradosstriper1 at all) + +------------------------------------------------------------------- +Tue Nov 6 21:46:19 UTC 2018 - ncutler@suse.com + +- Update to v14.0.1-154-g7588072b82: + + based on upstream nautilus 5f51cd286b747b1729006a5b98fb08b1b646237a + (v14.0.1 release) + ------------------------------------------------------------------- Mon Oct 29 14:02:13 UTC 2018 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index e8b45ee..6ffc9c6 100644 --- a/ceph.spec +++ b/ceph.spec @@ -89,7 +89,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.0.0.4389+g4c34d15e48 +Version: 14.0.1.268+g3a87f182b7 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -105,7 +105,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.0-4389-g4c34d15e48.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.0.1-268-g3a87f182b7.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -374,7 +374,10 @@ Provides: libxio = 1.7 Obsoletes: libxio <= 1.7 %endif %if 0%{with libradosstriper} -Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} +Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} +%else +Provides: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} +Obsoletes: libradosstriper1 <= %{_epoch_prefix}%{version}-%{release} %endif %{?systemd_requires} %if 0%{?suse_version} @@ -911,7 +914,7 @@ python-rbd, python-rgw or python-cephfs instead. # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.0.0-4389-g4c34d15e48 +%autosetup -p1 -n ceph-14.0.1-268-g3a87f182b7 %build