rpm/ceph
SHA256
1
0
Fork 0
forked from pool/ceph
Code Pull Requests Activity

Accepting request 668700 from filesystems:ceph:nautilus

Browse Source 
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
This commit is contained in:
Nathan Cutler 2019-01-25 15:37:01 +00:00 committed by Git OBS Bridge
parent a35eece52c
commit 72197d59df
6 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-14.0.1-2789-g6c941e4d76.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f81bb51113c3f9d71470c831197c5e99d87d2c0e41247616e7daef1ec10f0a9
size 95566321

3
ceph-14.0.1-3176-ge8d910619e.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bd60ab1dfb730430f154cc50a06d3894c9c82b183e8ec03076c3e6fcdc628f6e
size 95695490

7
ceph-test.changes
View File

@ -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 Mon Jan 14 13:16:35 UTC 2019 - ncutler@suse.com

8
ceph-test.spec
View File

@ -96,7 +96,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 14.0.1.2789+g6c941e4d76 Version: 14.0.1.3176+ge8d910619e
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 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 Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ 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} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -290,7 +290,7 @@ BuildRequires: python%{_python_buildid}-Routes
BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-Werkzeug
BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: python%{_python_buildid}-numpy-devel
BuildRequires: python%{_python_buildid}-bcrypt BuildRequires: python%{_python_buildid}-bcrypt
BuildRequires: libxmlsec1-1 BuildRequires: xmlsec1-devel
%endif %endif
%endif %endif
# lttng and babeltrace for rbd-replay-prep # lttng and babeltrace for rbd-replay-prep
@ -473,7 +473,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-14.0.1-2789-g6c941e4d76 %autosetup -p1 -n ceph-14.0.1-3176-ge8d910619e
%build %build

7
ceph.changes
View File

@ -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 Mon Jan 14 13:16:35 UTC 2019 - ncutler@suse.com

9
ceph.spec
View File

@ -96,7 +96,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 14.0.1.2789+g6c941e4d76 Version: 14.0.1.3176+ge8d910619e
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 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 Group: System/Filesystems
%endif %endif
URL: http://ceph.com/ 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} %if 0%{?suse_version}
# _insert_obs_source_lines_here # _insert_obs_source_lines_here
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
@ -282,7 +282,7 @@ BuildRequires: python%{_python_buildid}-Routes
BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-Werkzeug
BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: python%{_python_buildid}-numpy-devel
BuildRequires: python%{_python_buildid}-bcrypt BuildRequires: python%{_python_buildid}-bcrypt
BuildRequires: libxmlsec1-1 BuildRequires: xmlsec1-devel
%endif %endif
%endif %endif
# lttng and babeltrace for rbd-replay-prep # lttng and babeltrace for rbd-replay-prep
@ -467,6 +467,7 @@ Summary: Ceph fuse-based client
Group: System/Filesystems Group: System/Filesystems
%endif %endif
Requires: fuse Requires: fuse
Requires: python%{python3_pkgversion}
%description fuse %description fuse
FUSE based client for Ceph distributed network file system FUSE based client for Ceph distributed network file system
@ -972,7 +973,7 @@ integrated with the Ceph Manager Dashboard web UI.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-14.0.1-2789-g6c941e4d76 %autosetup -p1 -n ceph-14.0.1-3176-ge8d910619e
%build %build