pool/ceph
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 588028 from filesystems:ceph

Browse Source 
mimic-dev2 (forwarded request 588027 from smithfarm)

OBS-URL: https://build.opensuse.org/request/show/588028
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2018-03-18 20:42:41 +00:00 committed by Git OBS Bridge
commit 308b1ff632
6 changed files with 67 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-13.0.1-2078-g85df538001.tar.bz2
View File

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

3
ceph-13.0.1-3023-g71b0480e48.tar.bz2 Normal file
View File

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

11
ceph-test.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Mar 16 20:52:48 UTC 2018 - ncutler@suse.com
- Update to 13.0.1-3023-g71b0480e48:
+ mimic-dev2 (including notably dashboard_v2 MGR module)
-------------------------------------------------------------------
Fri Feb 23 12:10:01 UTC 2018 - ncutler@suse.com
- forward port DeepSea integration suite from ses5
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 20 16:52:18 UTC 2018 - ncutler@suse.com Tue Feb 20 16:52:18 UTC 2018 - ncutler@suse.com

34
ceph-test.spec
View File

@ -76,7 +76,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 13.0.1.2078+g85df538001 Version: 13.0.1.3023+g71b0480e48
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -92,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-1.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-13.0.1-2078-g85df538001.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3023-g71b0480e48.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -228,12 +228,23 @@ BuildRequires: python3-Cython
BuildRequires: python%{_python_buildid}-cherrypy BuildRequires: python%{_python_buildid}-cherrypy
BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: python%{_python_buildid}-werkzeug
BuildRequires: python%{_python_buildid}-tox
BuildRequires: python%{_python_buildid}-coverage
%if 0%{?fedora}
BuildRequires: python%{_python_buildid}-bcrypt
%endif
%if 0%{?rhel}
BuildRequires: py-bcrypt
%endif
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-CherryPy
BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-Werkzeug
BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: python%{_python_buildid}-numpy-devel
BuildRequires: python%{_python_buildid}-bcrypt
BuildRequires: python%{_python_buildid}-tox
BuildRequires: python%{_python_buildid}-coverage
%endif %endif
%endif %endif
# lttng and babeltrace for rbd-replay-prep # lttng and babeltrace for rbd-replay-prep
@ -282,13 +293,13 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{?fedora} || 0%{?rhel}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%if 0%{?fedora}
%endif
%if 0%{?rhel}
%endif
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
@ -397,7 +408,7 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-13.0.1-2078-g85df538001 %autosetup -p1 -n ceph-13.0.1-3023-g71b0480e48
%build %build
@ -460,13 +471,13 @@ cmake .. \
-DWITH_EMBEDDED=OFF \ -DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \ -DWITH_MANPAGE=ON \
-DWITH_PYTHON3=ON \ -DWITH_PYTHON3=ON \
-DWITH_MGR_DASHBOARD_V2_FRONTEND=OFF \
%if %{with python2} %if %{with python2}
-DWITH_PYTHON2=ON \ -DWITH_PYTHON2=ON \
%else %else
-DWITH_PYTHON2=OFF \ -DWITH_PYTHON2=OFF \
-DMGR_PYTHON_VERSION=3 \ -DMGR_PYTHON_VERSION=3 \
%endif %endif
-DWITH_SYSTEMD=ON \
%if 0%{?rhel} && ! 0%{?centos} %if 0%{?rhel} && ! 0%{?centos}
-DWITH_SUBMAN=ON \ -DWITH_SUBMAN=ON \
%endif %endif
@ -668,13 +679,8 @@ rm -rf %{buildroot}%{_libdir}/ceph/mgr
rm -rf %{buildroot}%{_unitdir}/ceph-mgr@.service rm -rf %{buildroot}%{_unitdir}/ceph-mgr@.service
rm -rf %{buildroot}%{_unitdir}/ceph-mgr.target rm -rf %{buildroot}%{_unitdir}/ceph-mgr.target
rm -rf %{buildroot}%{_bindir}/ceph-mon rm -rf %{buildroot}%{_bindir}/ceph-mon
rm -rf %{buildroot}%{_bindir}/ceph-rest-api
rm -rf %{buildroot}%{_bindir}/ceph-monstore-tool rm -rf %{buildroot}%{_bindir}/ceph-monstore-tool
rm -rf %{buildroot}%{_mandir}/man8/ceph-mon.8* rm -rf %{buildroot}%{_mandir}/man8/ceph-mon.8*
rm -rf %{buildroot}%{_mandir}/man8/ceph-rest-api.8*
rm -rf %{buildroot}%{python_sitelib}/ceph_rest_api.py*
rm -rf %{buildroot}%{python3_sitelib}/ceph_rest_api.py
rm -rf %{buildroot}%{python3_sitelib}/__pycache__/ceph_rest_api.cpython*.py*
rm -rf %{buildroot}%{_unitdir}/ceph-mon@.service rm -rf %{buildroot}%{_unitdir}/ceph-mon@.service
rm -rf %{buildroot}%{_unitdir}/ceph-mon.target rm -rf %{buildroot}%{_unitdir}/ceph-mon.target
rm -rf %{buildroot}%{_bindir}/ceph-fuse rm -rf %{buildroot}%{_bindir}/ceph-fuse
@ -860,8 +866,6 @@ rm -rf %{buildroot}
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
%endif %endif
%if 0%{with python2}
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}

11
ceph.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Mar 16 20:52:48 UTC 2018 - ncutler@suse.com
- Update to 13.0.1-3023-g71b0480e48:
+ mimic-dev2 (including notably dashboard_v2 MGR module)
-------------------------------------------------------------------
Fri Feb 23 12:10:01 UTC 2018 - ncutler@suse.com
- forward port DeepSea integration suite from ses5
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 20 16:52:18 UTC 2018 - ncutler@suse.com Tue Feb 20 16:52:18 UTC 2018 - ncutler@suse.com

43
ceph.spec
View File

@ -76,7 +76,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 13.0.1.2078+g85df538001 Version: 13.0.1.3023+g71b0480e48
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -92,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-1.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-13.0.1-2078-g85df538001.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.1-3023-g71b0480e48.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}
@ -220,12 +220,23 @@ BuildRequires: python3-Cython
BuildRequires: python%{_python_buildid}-cherrypy BuildRequires: python%{_python_buildid}-cherrypy
BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: python%{_python_buildid}-werkzeug
BuildRequires: python%{_python_buildid}-tox
BuildRequires: python%{_python_buildid}-coverage
%if 0%{?fedora}
BuildRequires: python%{_python_buildid}-bcrypt
%endif
%if 0%{?rhel}
BuildRequires: py-bcrypt
%endif
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-CherryPy
BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-Werkzeug
BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-pecan
BuildRequires: python%{_python_buildid}-numpy-devel BuildRequires: python%{_python_buildid}-numpy-devel
BuildRequires: python%{_python_buildid}-bcrypt
BuildRequires: python%{_python_buildid}-tox
BuildRequires: python%{_python_buildid}-coverage
%endif %endif
%endif %endif
# lttng and babeltrace for rbd-replay-prep # lttng and babeltrace for rbd-replay-prep
@ -282,7 +293,7 @@ Requires: util-linux
Requires: xfsprogs Requires: xfsprogs
Requires: which Requires: which
%if 0%{?suse_version} %if 0%{?suse_version}
Recommends: ntp-daemon Recommends: chrony
Provides: libxio = 1.7 Provides: libxio = 1.7
Obsoletes: libxio <= 1.7 Obsoletes: libxio <= 1.7
%endif %endif
@ -337,13 +348,6 @@ Summary: Ceph Monitor Daemon
Group: System/Filesystems Group: System/Filesystems
%endif %endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
# For ceph-rest-api
%if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-flask
%endif
%if 0%{?suse_version}
Requires: python%{_python_buildid}-Flask
%endif
%description mon %description mon
ceph-mon is the cluster monitor daemon for the Ceph distributed file ceph-mon is the cluster monitor daemon for the Ceph distributed file
system. One or more instances of ceph-mon form a Paxos part-time system. One or more instances of ceph-mon form a Paxos part-time
@ -362,6 +366,12 @@ Requires: python%{_python_buildid}-jinja2
Requires: python%{_python_buildid}-pecan Requires: python%{_python_buildid}-pecan
Requires: python%{_python_buildid}-werkzeug Requires: python%{_python_buildid}-werkzeug
Requires: pyOpenSSL%{_python_buildid} Requires: pyOpenSSL%{_python_buildid}
%if 0%{?fedora}
Requires: python%{_python_buildid}-bcrypt
%endif
%if 0%{?rhel}
Requires: py-bcrypt
%endif
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: python%{_python_buildid}-CherryPy Requires: python%{_python_buildid}-CherryPy
@ -369,6 +379,7 @@ Requires: python%{_python_buildid}-Jinja2
Requires: python%{_python_buildid}-Werkzeug Requires: python%{_python_buildid}-Werkzeug
Requires: python%{_python_buildid}-pecan Requires: python%{_python_buildid}-pecan
Requires: python%{_python_buildid}-pyOpenSSL Requires: python%{_python_buildid}-pyOpenSSL
Requires: python%{_python_buildid}-bcrypt
Recommends: python%{_python_buildid}-influxdb Recommends: python%{_python_buildid}-influxdb
%endif %endif
%description mgr %description mgr
@ -829,7 +840,7 @@ python-rbd, python-rgw or python-cephfs instead.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-13.0.1-2078-g85df538001 %autosetup -p1 -n ceph-13.0.1-3023-g71b0480e48
%build %build
@ -892,13 +903,13 @@ cmake .. \
-DWITH_EMBEDDED=OFF \ -DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \ -DWITH_MANPAGE=ON \
-DWITH_PYTHON3=ON \ -DWITH_PYTHON3=ON \
-DWITH_MGR_DASHBOARD_V2_FRONTEND=OFF \
%if %{with python2} %if %{with python2}
-DWITH_PYTHON2=ON \ -DWITH_PYTHON2=ON \
%else %else
-DWITH_PYTHON2=OFF \ -DWITH_PYTHON2=OFF \
-DMGR_PYTHON_VERSION=3 \ -DMGR_PYTHON_VERSION=3 \
%endif %endif
-DWITH_SYSTEMD=ON \
%if 0%{?rhel} && ! 0%{?centos} %if 0%{?rhel} && ! 0%{?centos}
-DWITH_SUBMAN=ON \ -DWITH_SUBMAN=ON \
%endif %endif
@ -1324,16 +1335,8 @@ fi
%files mon %files mon
%{_bindir}/ceph-mon %{_bindir}/ceph-mon
%{_bindir}/ceph-rest-api
%{_bindir}/ceph-monstore-tool %{_bindir}/ceph-monstore-tool
%{_mandir}/man8/ceph-mon.8* %{_mandir}/man8/ceph-mon.8*
%{_mandir}/man8/ceph-rest-api.8*
%if 0%{with python2}
%{python_sitelib}/ceph_rest_api.py*
%else
%{python3_sitelib}/ceph_rest_api.py
%{python3_sitelib}/__pycache__/ceph_rest_api.cpython*.py*
%endif
%{_unitdir}/ceph-mon@.service %{_unitdir}/ceph-mon@.service
%{_unitdir}/ceph-mon.target %{_unitdir}/ceph-mon.target
%attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/mon