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

Accepting request 597000 from filesystems:ceph:mimic

Browse Source 
13.0.2-984

OBS-URL: https://build.opensuse.org/request/show/597000
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=181
This commit is contained in:
Nathan Cutler 2018-04-16 12:34:03 +00:00 committed by Git OBS Bridge
parent 326dbd5a8f
commit 5fa13ad0b9
7 changed files with 27 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-13.0.2-1292-g53e40cbaae.tar.bz2
View File

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

3
ceph-13.0.2-984-g852d3f1411.tar.bz2 Normal file
View File

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

11
ceph-test.changes
View File

@ -1,18 +1,11 @@
-------------------------------------------------------------------
Fri Apr 13 21:49:36 UTC 2018 - ncutler@suse.com
- Update to 13.0.2-1292-g53e40cbaae:
+ based on upstream master 4520d43ada7fb96b808c21647b9f58d9e63f91e8
+ adds new lz4 dependency for OSD
+ declares existing e2fsprogs dependency for ceph-disk
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com
- Update to 13.0.2-980-gd814079503: - Update to 13.0.2-984-g852d3f1411:
+ based on upstream master aaac83abb516f824f1caef470686b1bffeffa8b4 + based on upstream master aaac83abb516f824f1caef470686b1bffeffa8b4
+ fixes s390x build failure (bsc#1089291) + fixes s390x build failure (bsc#1089291)
+ introduces liboath0 runtime dependency (bsc#1089302) + introduces liboath0 runtime dependency (bsc#1089302)
+ fixes RGW SSL deployment
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 12 18:13:35 UTC 2018 - ncutler@suse.com Thu Apr 12 18:13:35 UTC 2018 - ncutler@suse.com

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.2.1292+g53e40cbaae Version: 13.0.2.984+g852d3f1411
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.2-1292-g53e40cbaae.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.2-984-g852d3f1411.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -197,7 +197,6 @@ BuildRequires: python%{_python_buildid}-Cython
BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-PrettyTable
BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: python%{_python_buildid}-Sphinx
BuildRequires: rdma-core-devel BuildRequires: rdma-core-devel
BuildRequires: liblz4-devel >= 1.7
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
@ -213,7 +212,6 @@ BuildRequires: redhat-lsb-core
BuildRequires: Cython%{_python_buildid} BuildRequires: Cython%{_python_buildid}
BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-prettytable
BuildRequires: python%{_python_buildid}-sphinx BuildRequires: python%{_python_buildid}-sphinx
BuildRequires: lz4-devel >= 1.7
%endif %endif
# python34-... for RHEL, python3-... for all other supported distros # python34-... for RHEL, python3-... for all other supported distros
%if 0%{?rhel} %if 0%{?rhel}
@ -284,8 +282,6 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%if 0%{with selinux} %if 0%{with selinux}
%endif %endif
%if 0%{?fedora} || 0%{?rhel}
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
@ -330,6 +326,10 @@ 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%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
@ -411,7 +411,7 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-13.0.2-1292-g53e40cbaae %autosetup -p1 -n ceph-13.0.2-984-g852d3f1411
%build %build

11
ceph.changes
View File

@ -1,18 +1,11 @@
-------------------------------------------------------------------
Fri Apr 13 21:49:36 UTC 2018 - ncutler@suse.com
- Update to 13.0.2-1292-g53e40cbaae:
+ based on upstream master 4520d43ada7fb96b808c21647b9f58d9e63f91e8
+ adds new lz4 dependency for OSD
+ declares existing e2fsprogs dependency for ceph-disk
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com
- Update to 13.0.2-980-gd814079503: - Update to 13.0.2-984-g852d3f1411:
+ based on upstream master aaac83abb516f824f1caef470686b1bffeffa8b4 + based on upstream master aaac83abb516f824f1caef470686b1bffeffa8b4
+ fixes s390x build failure (bsc#1089291) + fixes s390x build failure (bsc#1089291)
+ introduces liboath0 runtime dependency (bsc#1089302) + introduces liboath0 runtime dependency (bsc#1089302)
+ fixes RGW SSL deployment
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 12 18:13:35 UTC 2018 - ncutler@suse.com Thu Apr 12 18:13:35 UTC 2018 - ncutler@suse.com

22
ceph.spec
View File

@ -76,7 +76,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 13.0.2.1292+g53e40cbaae Version: 13.0.2.984+g852d3f1411
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.2-1292-g53e40cbaae.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.2-984-g852d3f1411.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}
@ -189,7 +189,6 @@ BuildRequires: python%{_python_buildid}-Cython
BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-PrettyTable
BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: python%{_python_buildid}-Sphinx
BuildRequires: rdma-core-devel BuildRequires: rdma-core-devel
BuildRequires: liblz4-devel >= 1.7
%endif %endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Requires: systemd Requires: systemd
@ -205,7 +204,6 @@ BuildRequires: redhat-lsb-core
BuildRequires: Cython%{_python_buildid} BuildRequires: Cython%{_python_buildid}
BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-prettytable
BuildRequires: python%{_python_buildid}-sphinx BuildRequires: python%{_python_buildid}-sphinx
BuildRequires: lz4-devel >= 1.7
%endif %endif
# python34-... for RHEL, python3-... for all other supported distros # python34-... for RHEL, python3-... for all other supported distros
%if 0%{?rhel} %if 0%{?rhel}
@ -288,23 +286,17 @@ Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
%endif %endif
Requires: cryptsetup Requires: cryptsetup
Requires: e2fsprogs
Requires: findutils Requires: findutils
Requires: grep Requires: grep
Requires: logrotate Requires: logrotate
Requires: parted
Requires: psmisc Requires: psmisc
Requires: python%{_python_buildid}-requests Requires: python%{_python_buildid}-requests
Requires: python%{_python_buildid}-setuptools Requires: python%{_python_buildid}-setuptools
Requires: util-linux Requires: util-linux
Requires: xfsprogs Requires: xfsprogs
Requires: which Requires: which
%if 0%{?fedora} || 0%{?rhel}
Requires: gdisk
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
Recommends: chrony Recommends: chrony
Requires: gptfdisk
Provides: libxio = 1.7 Provides: libxio = 1.7
Obsoletes: libxio <= 1.7 Obsoletes: libxio <= 1.7
%endif %endif
@ -481,6 +473,14 @@ Summary: Ceph Object Storage Daemon
Group: System/Filesystems Group: System/Filesystems
%endif %endif
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
# for sgdisk, used by ceph-disk
%if 0%{?fedora} || 0%{?rhel}
Requires: gdisk
%endif
%if 0%{?suse_version}
Requires: gptfdisk
%endif
Requires: parted
Requires: lvm2 Requires: lvm2
%description osd %description osd
ceph-osd is the object storage daemon for the Ceph distributed file ceph-osd is the object storage daemon for the Ceph distributed file
@ -845,7 +845,7 @@ python-rbd, python-rgw or python-cephfs instead.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-13.0.2-1292-g53e40cbaae %autosetup -p1 -n ceph-13.0.2-984-g852d3f1411
%build %build

2
checkin.sh
View File

@ -6,6 +6,8 @@
# git clone or repo+branch combination for the "ceph" package in OBS. # git clone or repo+branch combination for the "ceph" package in OBS.
# #
set -x
BASEDIR=$(pwd) BASEDIR=$(pwd)
function usage { function usage {