Accepting request 686411 from filesystems:ceph:nautilus

14.2.0

OBS-URL: https://build.opensuse.org/request/show/686411
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=215
This commit is contained in:
Nathan Cutler 2019-03-19 12:42:08 +00:00 committed by Git OBS Bridge
parent 4e9cd2227c
commit a5dcc2e6a9
6 changed files with 39 additions and 15 deletions

View File

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

View File

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

View File

@ -1,8 +1,18 @@
-------------------------------------------------------------------
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 release, SHA1 98653b3db92f69023cb62526791d4d9aa5d6ec23
+ 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

View File

@ -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.1.457+g1411dbed54
Version: 14.2.0.296+g063d979413
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.1-457-g1411dbed54.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-14.2.0-296-g063d979413.tar.bz2
%if 0%{?suse_version}
Source96: checkin.sh
Source97: README-checkin.txt
@ -381,7 +383,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{without python2}
%endif
%endif
%if 0%{?rhel} <= 7
%if 0%{?rhel} == 7
%endif
%if 0%{?suse_version}
%endif
@ -498,7 +500,7 @@ This package contains Ceph benchmarks and test tools.
%if 0%{?suse_version}
%endif
%prep
%autosetup -p1 -n ceph-14.1.1-457-g1411dbed54
%autosetup -p1 -n ceph-14.2.0-296-g063d979413
%build

View File

@ -1,8 +1,18 @@
-------------------------------------------------------------------
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 release, SHA1 98653b3db92f69023cb62526791d4d9aa5d6ec23
+ 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

View File

@ -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.1.457+g1411dbed54
Version: 14.2.0.296+g063d979413
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.1-457-g1411dbed54.tar.bz2
Source0: %{?_remote_tarball_prefix}ceph-14.2.0-296-g063d979413.tar.bz2
%if 0%{?suse_version}
# _insert_obs_source_lines_here
ExclusiveArch: x86_64 aarch64 ppc64le s390x
@ -507,7 +509,7 @@ Requires: python3-scipy
Requires: python2-scipy
%endif
%endif
%if 0%{?rhel} <= 7
%if 0%{?rhel} == 7
Requires: numpy
Requires: scipy
%endif
@ -1050,7 +1052,7 @@ integrated with the Ceph Manager Dashboard web UI.
# common
#################################################################################
%prep
%autosetup -p1 -n ceph-14.1.1-457-g1411dbed54
%autosetup -p1 -n ceph-14.2.0-296-g063d979413
%build