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

Accepting request 685390 from filesystems:ceph:nautilus

Browse Source 
14.1.1

OBS-URL: https://build.opensuse.org/request/show/685390
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=213
This commit is contained in:
Nathan Cutler 2019-03-15 14:24:05 +00:00 committed by Git OBS Bridge
parent a894ca1bcf
commit e91d55fe8f
7 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-14.1.0-559-gf1a72cff25.tar.bz2
View File

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

3
ceph-14.1.1-457-g1411dbed54.tar.bz2 Normal file
View File

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

10
ceph-test.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Mar 15 12:20:13 UTC 2019 - ncutler@suse.com
- Update to 14.1.1.456+gedcae762e2:
+ rebase on top of upstream nautilus release, SHA1 98653b3db92f69023cb62526791d4d9aa5d6ec23
* upstream Nautilus 14.1.1 (RC2) release
* mgr: Fix broken get_localized_module_option function (bsc#1127342)
* spec: ceph-osd gets new runtime dependency, libstoragemgmt
+ dashboard: Update downstream branding (bsc#1129224)
-------------------------------------------------------------------
Mon Mar 4 11:49:18 UTC 2019 - ncutler@suse.com

20
ceph-test.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ceph
#
# Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file
# Copyright (C) 2004-2019 The Ceph Project Developers. See COPYING file
# at the top-level directory of this distribution and at
# https://github.com/ceph/ceph/blob/master/COPYING
#
@ -97,7 +97,7 @@
# main package definition
#################################################################################
Name: ceph-test
Version: 14.1.0.559+gf1a72cff25
Version: 14.1.1.457+g1411dbed54
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -113,14 +113,14 @@ 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.1.0-559-gf1a72cff25.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-14.1.1-457-g1411dbed54.tar.bz2
%if 0%{?suse_version}
Source96: checkin.sh
Source97: README-checkin.txt
Source98: README-ceph-test.txt
Source99: ceph-rpmlintrc
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le
ExclusiveArch: x86_64
%endif
#################################################################################
# dependencies that apply across all distro families
@ -262,8 +262,10 @@ BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: CUnit-devel
BuildRequires: redhat-lsb-core
%if 0%{with python2}
BuildRequires: python2-Cython
%endif
%if 0%{?rhel} == 7
BuildRequires: Cython
BuildRequires: python34-devel
BuildRequires: python34-setuptools
BuildRequires: python34-Cython
@ -375,9 +377,11 @@ This package contains Ceph benchmarks and test tools.
%endif
%if 0%{?suse_version}
%endif
%if 0%{?fedora} || 0%{?rhel}
%if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?suse_version}
%if 0%{without python2}
%endif
%if 0%{?suse_version}
%endif
%if 0%{?rhel} <= 7
%endif
%if 0%{?suse_version}
%endif
@ -494,7 +498,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version}
%endif
%prep
%autosetup -p1 -n ceph-14.1.0-559-gf1a72cff25
%autosetup -p1 -n ceph-14.1.1-457-g1411dbed54
%build

11
ceph.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Mar 15 12:20:13 UTC 2019 - ncutler@suse.com
- Update to 14.1.1.456+gedcae762e2:
+ rebase on top of upstream nautilus release, SHA1 98653b3db92f69023cb62526791d4d9aa5d6ec23
* upstream Nautilus 14.1.1 (RC2) release
* mgr: Fix broken get_localized_module_option function (bsc#1127342)
* spec: ceph-osd gets new runtime dependency, libstoragemgmt
+ dashboard: Update downstream branding (bsc#1129224)
+ spec: build ceph-test package on x86_64 arch only (bsc#1129274)
-------------------------------------------------------------------
Mon Mar 4 11:49:18 UTC 2019 - ncutler@suse.com

27
ceph.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ceph
#
# Copyright (C) 2004-2017 The Ceph Project Developers. See COPYING file
# Copyright (C) 2004-2019 The Ceph Project Developers. See COPYING file
# at the top-level directory of this distribution and at
# https://github.com/ceph/ceph/blob/master/COPYING
#
@ -97,7 +97,7 @@
# main package definition
#################################################################################
Name: ceph
Version: 14.1.0.559+gf1a72cff25
Version: 14.1.1.457+g1411dbed54
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -113,7 +113,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.1.0-559-gf1a72cff25.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-14.1.1-457-g1411dbed54.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -254,8 +254,10 @@ BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: CUnit-devel
BuildRequires: redhat-lsb-core
%if 0%{with python2}
BuildRequires: python2-Cython
%endif
%if 0%{?rhel} == 7
BuildRequires: Cython
BuildRequires: python34-devel
BuildRequires: python34-setuptools
BuildRequires: python34-Cython
@ -497,14 +499,18 @@ BuildArch: noarch
Group: System/Filesystems
%endif
Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel}
%if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?suse_version}
Requires: python%{_python_buildid}-numpy
%if 0%{without python2}
Requires: python3-scipy
%else
Requires: python2-scipy
%endif
%endif
%if 0%{?rhel} <= 7
Requires: numpy
Requires: scipy
%endif
%if 0%{?suse_version}
Requires: python%{_python_buildid}-numpy
Requires: python%{_python_buildid}-scipy
%endif
%description mgr-diskprediction-local
ceph-mgr-diskprediction-local is a ceph-mgr plugin that tries to predict
disk failures using local algorithms and machine-learning databases.
@ -629,6 +635,7 @@ Provides: ceph-test:/usr/bin/ceph-osdomap-tool
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
Requires: lvm2
Requires: sudo
Requires: libstoragemgmt
%description osd
ceph-osd is the object storage daemon for the Ceph distributed file
system. It is responsible for storing objects on a local file system
@ -1043,7 +1050,7 @@ integrated with the Ceph Manager Dashboard web UI.
# common
#################################################################################
%prep
%autosetup -p1 -n ceph-14.1.0-559-gf1a72cff25
%autosetup -p1 -n ceph-14.1.1-457-g1411dbed54
%build

2
pre_checkin.sh
View File

@ -170,7 +170,7 @@ function transform_spec_file {
line=`echo $line | sed 's/%{name}/ceph/g'`
;;
"ExclusiveArch:"*)
line=`echo $line | sed 's/s390\S*//g'`
line="ExclusiveArch: x86_64"
;;
"%autosetup -p1")
line="%autosetup -p1 -n ceph-%version"