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

Accepting request 596030 from filesystems:ceph:mimic

Browse Source 
13.0.2-819

OBS-URL: https://build.opensuse.org/request/show/596030
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=177
This commit is contained in:
Nathan Cutler 2018-04-12 18:17:08 +00:00 committed by Git OBS Bridge
parent 03e27294ee
commit e0b5bd9a24
7 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_constraints
View File

@ -27,7 +27,7 @@
<size unit="G">28</size> <size unit="G">28</size>
</disk> </disk>
<memory> <memory>
<size unit="G">11</size> <size unit="G">12</size>
</memory> </memory>
</hardware> </hardware>
</overwrite> </overwrite>

3
ceph-13.0.1-3204-g17e0216271.tar.bz2
View File

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

3
ceph-13.0.2-819-gf64b021d4c.tar.bz2 Normal file
View File

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

9
ceph-test.changes
View File

@ -1,8 +1,13 @@
-------------------------------------------------------------------
Thu Apr 12 18:13:35 UTC 2018 - ncutler@suse.com
- Update to 13.0.2-819-gf64b021d4c
+ based on upstream master 3ab655b55d2b363c0352dfbb90caed2ffcd42432
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 12 02:11:19 UTC 2018 - ncutler@suse.com Thu Apr 12 02:11:19 UTC 2018 - ncutler@suse.com
- tweak the ceph-test constraints (latest version of Ceph does not - reduce ceph-test constraints for ppc64le and s390x
require so much disk space/memory)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de

14
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.3204+g17e0216271 Version: 13.0.2.819+gf64b021d4c
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-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-13.0.1-3204-g17e0216271.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.2-819-gf64b021d4c.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -112,7 +112,7 @@ ExclusiveArch: x86_64 aarch64 ppc64le
Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} Requires: ceph-common
Requires: xmlstarlet Requires: xmlstarlet
Requires: jq Requires: jq
Requires: socat Requires: socat
@ -226,6 +226,7 @@ BuildRequires: python3-Cython
%if 0%{with make_check} %if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
BuildRequires: python%{_python_buildid}-cherrypy BuildRequires: python%{_python_buildid}-cherrypy
BuildRequires: python%{_python_buildid}-routes
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}-tox
@ -239,6 +240,7 @@ BuildRequires: py-bcrypt
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-CherryPy
BuildRequires: python%{_python_buildid}-Routes
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
@ -408,7 +410,7 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-13.0.1-3204-g17e0216271 %autosetup -p1 -n ceph-13.0.2-819-gf64b021d4c
%build %build
@ -757,6 +759,8 @@ rm -rf %{buildroot}%{_includedir}/rbd/features.h
rm -rf %{buildroot}%{_libdir}/librbd.so rm -rf %{buildroot}%{_libdir}/librbd.so
rm -rf %{buildroot}%{_libdir}/librbd_tp.so rm -rf %{buildroot}%{_libdir}/librbd_tp.so
rm -rf %{buildroot}%{_libdir}/librgw.so.* rm -rf %{buildroot}%{_libdir}/librgw.so.*
rm -rf %{buildroot}%{_libdir}/librgw_op_tp.so*
rm -rf %{buildroot}%{_libdir}/librgw_rados_tp.so*
rm -rf %{buildroot}%{_includedir}/rados/librgw.h rm -rf %{buildroot}%{_includedir}/rados/librgw.h
rm -rf %{buildroot}%{_includedir}/rados/rgw_file.h rm -rf %{buildroot}%{_includedir}/rados/rgw_file.h
rm -rf %{buildroot}%{_libdir}/librgw.so rm -rf %{buildroot}%{_libdir}/librgw.so
@ -930,6 +934,8 @@ rm -rf %{buildroot}
%endif %endif
%if %{with lttng} %if %{with lttng}
%endif %endif
%if %{with lttng}
%endif
%if 0%{with python2} %if 0%{with python2}
%endif %endif
%if 0%{with python2} %if 0%{with python2}

9
ceph.changes
View File

@ -1,8 +1,13 @@
-------------------------------------------------------------------
Thu Apr 12 18:13:35 UTC 2018 - ncutler@suse.com
- Update to 13.0.2-819-gf64b021d4c
+ based on upstream master 3ab655b55d2b363c0352dfbb90caed2ffcd42432
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 12 02:11:19 UTC 2018 - ncutler@suse.com Thu Apr 12 02:11:19 UTC 2018 - ncutler@suse.com
- tweak the ceph-test constraints (latest version of Ceph does not - reduce ceph-test constraints for ppc64le and s390x
require so much disk space/memory)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de Tue Mar 27 14:04:19 UTC 2018 - schwab@suse.de

16
ceph.spec
View File

@ -76,7 +76,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 13.0.1.3204+g17e0216271 Version: 13.0.2.819+gf64b021d4c
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-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-13.0.1-3204-g17e0216271.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.2-819-gf64b021d4c.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}
@ -218,6 +218,7 @@ BuildRequires: python3-Cython
%if 0%{with make_check} %if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
BuildRequires: python%{_python_buildid}-cherrypy BuildRequires: python%{_python_buildid}-cherrypy
BuildRequires: python%{_python_buildid}-routes
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}-tox
@ -231,6 +232,7 @@ BuildRequires: py-bcrypt
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-CherryPy
BuildRequires: python%{_python_buildid}-Routes
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
@ -362,6 +364,7 @@ Group: System/Filesystems
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Requires: python%{_python_buildid}-cherrypy Requires: python%{_python_buildid}-cherrypy
Requires: python%{_python_buildid}-routes
Requires: python%{_python_buildid}-jinja2 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
@ -375,6 +378,7 @@ Requires: py-bcrypt
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: python%{_python_buildid}-CherryPy Requires: python%{_python_buildid}-CherryPy
Requires: python%{_python_buildid}-Routes
Requires: python%{_python_buildid}-Jinja2 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
@ -739,7 +743,7 @@ Summary: Ceph benchmarks and test tools
%if 0%{?suse_version} %if 0%{?suse_version}
Group: System/Benchmark Group: System/Benchmark
%endif %endif
Requires: ceph-common = %{_epoch_prefix}%{version}-%{release} Requires: ceph-common
Requires: xmlstarlet Requires: xmlstarlet
Requires: jq Requires: jq
Requires: socat Requires: socat
@ -840,7 +844,7 @@ python-rbd, python-rgw or python-cephfs instead.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-13.0.1-3204-g17e0216271 %autosetup -p1 -n ceph-13.0.2-819-gf64b021d4c
%build %build
@ -1657,6 +1661,10 @@ fi
%files -n librgw2 %files -n librgw2
%{_libdir}/librgw.so.* %{_libdir}/librgw.so.*
%if %{with lttng}
%{_libdir}/librgw_op_tp.so*
%{_libdir}/librgw_rados_tp.so*
%endif
%post -n librgw2 -p /sbin/ldconfig %post -n librgw2 -p /sbin/ldconfig