From 72197d59dfbbd880121c171e720d2571131fc9d78e987e8c5e2d07103bb0af67 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 25 Jan 2019 15:37:01 +0000 Subject: [PATCH] Accepting request 668700 from filesystems:ceph:nautilus fix xmlsec1 build dependency for dashboard make check OBS-URL: https://build.opensuse.org/request/show/668700 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=205 --- ceph-14.0.1-2789-g6c941e4d76.tar.bz2 | 3 --- ceph-14.0.1-3176-ge8d910619e.tar.bz2 | 3 +++ ceph-test.changes | 7 +++++++ ceph-test.spec | 8 ++++---- ceph.changes | 7 +++++++ ceph.spec | 9 +++++---- 6 files changed, 26 insertions(+), 11 deletions(-) delete mode 100644 ceph-14.0.1-2789-g6c941e4d76.tar.bz2 create mode 100644 ceph-14.0.1-3176-ge8d910619e.tar.bz2 diff --git a/ceph-14.0.1-2789-g6c941e4d76.tar.bz2 b/ceph-14.0.1-2789-g6c941e4d76.tar.bz2 deleted file mode 100644 index 0503c2b..0000000 --- a/ceph-14.0.1-2789-g6c941e4d76.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f81bb51113c3f9d71470c831197c5e99d87d2c0e41247616e7daef1ec10f0a9 -size 95566321 diff --git a/ceph-14.0.1-3176-ge8d910619e.tar.bz2 b/ceph-14.0.1-3176-ge8d910619e.tar.bz2 new file mode 100644 index 0000000..f8e2b83 --- /dev/null +++ b/ceph-14.0.1-3176-ge8d910619e.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd60ab1dfb730430f154cc50a06d3894c9c82b183e8ec03076c3e6fcdc628f6e +size 95695490 diff --git a/ceph-test.changes b/ceph-test.changes index 44bea01..6c6cf3e 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 25 15:31:56 UTC 2019 - ncutler@suse.com + +- Update to 14.0.1-3176-ge8d910619e: + + rebase on top of upstream master branch, SHA1 cc26a67890b58c678d4bb26f6a408cf1742317b5 + * spec: fix xmlsec1 build dependency for dashboard make check + ------------------------------------------------------------------- Mon Jan 14 13:16:35 UTC 2019 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index f8df416..7444210 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -96,7 +96,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.0.1.2789+g6c941e4d76 +Version: 14.0.1.3176+ge8d910619e 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-2789-g6c941e4d76.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.0.1-3176-ge8d910619e.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -290,7 +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 +BuildRequires: xmlsec1-devel %endif %endif # lttng and babeltrace for rbd-replay-prep @@ -473,7 +473,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-14.0.1-2789-g6c941e4d76 +%autosetup -p1 -n ceph-14.0.1-3176-ge8d910619e %build diff --git a/ceph.changes b/ceph.changes index 44bea01..6c6cf3e 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 25 15:31:56 UTC 2019 - ncutler@suse.com + +- Update to 14.0.1-3176-ge8d910619e: + + rebase on top of upstream master branch, SHA1 cc26a67890b58c678d4bb26f6a408cf1742317b5 + * spec: fix xmlsec1 build dependency for dashboard make check + ------------------------------------------------------------------- Mon Jan 14 13:16:35 UTC 2019 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 04a7aae..8a1c149 100644 --- a/ceph.spec +++ b/ceph.spec @@ -96,7 +96,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.0.1.2789+g6c941e4d76 +Version: 14.0.1.3176+ge8d910619e 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-2789-g6c941e4d76.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.0.1-3176-ge8d910619e.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -282,7 +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 +BuildRequires: xmlsec1-devel %endif %endif # lttng and babeltrace for rbd-replay-prep @@ -467,6 +467,7 @@ Summary: Ceph fuse-based client Group: System/Filesystems %endif Requires: fuse +Requires: python%{python3_pkgversion} %description fuse FUSE based client for Ceph distributed network file system @@ -972,7 +973,7 @@ integrated with the Ceph Manager Dashboard web UI. # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.0.1-2789-g6c941e4d76 +%autosetup -p1 -n ceph-14.0.1-3176-ge8d910619e %build