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

Accepting request 687168 from filesystems:ceph

Browse Source 
boo#1129921 (forwarded request 687167 from smithfarm)

OBS-URL: https://build.opensuse.org/request/show/687168
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ceph?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2019-03-24 13:57:16 +00:00 committed by Git OBS Bridge
commit d79843654a
7 changed files with 95 additions and 25 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.2.0-300-gacd2f2b9e1.tar.bz2 Normal file
View File

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

28
ceph-test.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Thu Mar 21 08:24:05 UTC 2019 - ncutler@suse.com
- Update to 14.2.0-300-gacd2f2b9e1:
+ spec/ceph-mgr: drop "Recommends: ceph-mgr-ssh"
+ cmake: empty INSTALL_RPATH for libceph_crypto_openssl.so (boo#1129921)
-------------------------------------------------------------------
Tue Mar 19 10:05:12 UTC 2019 - ncutler@suse.com
- Update to 14.2.0-296-g063d979413:
+ rebase on top of upstream nautilus branch, SHA1 3a54b2b6d167d4a2a19e003a705696d4fe619afc
* upstream Nautilus 14.2.0 (stable) release
release notes: http://docs.ceph.com/docs/master/releases/nautilus/
+ rpm: fix "rhel <= 7" conditional (bsc#1129595)
+ rpm: refrain from building ceph-resource-agents on SLE (bsc#1129597)
-------------------------------------------------------------------
Fri Mar 15 12:20:13 UTC 2019 - ncutler@suse.com
- Update to 14.1.1-457-g1411dbed54:
+ rebase on top of upstream nautilus branch, 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

24
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
#
@ -20,7 +20,6 @@
# please read http://rpm.org/user_doc/conditional_builds.html for explanation of
# bcond syntax!
#################################################################################
%bcond_without ocf
%bcond_with make_check
%ifarch s390 s390x
%bcond_with tcmalloc
@ -33,6 +32,7 @@
%bcond_without cephfs_java
%bcond_without lttng
%bcond_without libradosstriper
%bcond_without ocf
%bcond_without amqp_endpoint
%global _remote_tarball_prefix https://download.ceph.com/tarballs/
%endif
@ -47,8 +47,10 @@
%endif
%if 0%{?is_opensuse}
%bcond_without libradosstriper
%bcond_without ocf
%else
%bcond_with libradosstriper
%bcond_with ocf
%endif
%ifarch x86_64 aarch64 ppc64le
%bcond_without lttng
@ -97,7 +99,7 @@
# main package definition
#################################################################################
Name: ceph-test
Version: 14.1.0.559+gf1a72cff25
Version: 14.2.0.300+gacd2f2b9e1
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -113,14 +115,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.2.0-300-gacd2f2b9e1.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 +264,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 +379,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 +500,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.2.0-300-gacd2f2b9e1
%build

28
ceph.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Thu Mar 21 08:24:05 UTC 2019 - ncutler@suse.com
- Update to 14.2.0-300-gacd2f2b9e1:
+ spec/ceph-mgr: drop "Recommends: ceph-mgr-ssh"
+ cmake: empty INSTALL_RPATH for libceph_crypto_openssl.so (boo#1129921)
-------------------------------------------------------------------
Tue Mar 19 10:05:12 UTC 2019 - ncutler@suse.com
- Update to 14.2.0-296-g063d979413:
+ rebase on top of upstream nautilus branch, SHA1 3a54b2b6d167d4a2a19e003a705696d4fe619afc
* upstream Nautilus 14.2.0 (stable) release
release notes: http://docs.ceph.com/docs/master/releases/nautilus/
+ rpm: fix "rhel <= 7" conditional (bsc#1129595)
+ rpm: refrain from building ceph-resource-agents on SLE (bsc#1129597)
-------------------------------------------------------------------
Fri Mar 15 12:20:13 UTC 2019 - ncutler@suse.com
- Update to 14.1.1-457-g1411dbed54:
+ rebase on top of upstream nautilus branch, 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

32
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
#
@ -20,7 +20,6 @@
# please read http://rpm.org/user_doc/conditional_builds.html for explanation of
# bcond syntax!
#################################################################################
%bcond_without ocf
%bcond_with make_check
%ifarch s390 s390x
%bcond_with tcmalloc
@ -33,6 +32,7 @@
%bcond_without cephfs_java
%bcond_without lttng
%bcond_without libradosstriper
%bcond_without ocf
%bcond_without amqp_endpoint
%global _remote_tarball_prefix https://download.ceph.com/tarballs/
%endif
@ -47,8 +47,10 @@
%endif
%if 0%{?is_opensuse}
%bcond_without libradosstriper
%bcond_without ocf
%else
%bcond_with libradosstriper
%bcond_with ocf
%endif
%ifarch x86_64 aarch64 ppc64le
%bcond_without lttng
@ -97,7 +99,7 @@
# main package definition
#################################################################################
Name: ceph
Version: 14.1.0.559+gf1a72cff25
Version: 14.2.0.300+gacd2f2b9e1
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@ -113,7 +115,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.2.0-300-gacd2f2b9e1.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -254,8 +256,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
@ -447,7 +451,6 @@ Recommends: ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release}
Recommends: ceph-mgr-diskprediction-local = %{_epoch_prefix}%{version}-%{release}
Recommends: ceph-mgr-diskprediction-cloud = %{_epoch_prefix}%{version}-%{release}
Recommends: ceph-mgr-rook = %{_epoch_prefix}%{version}-%{release}
Recommends: ceph-mgr-ssh = %{_epoch_prefix}%{version}-%{release}
%endif
%if 0%{?rhel} == 7
Requires: pyOpenSSL
@ -497,14 +500,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 +636,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 +1051,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.2.0-300-gacd2f2b9e1
%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"