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

Accepting request 570618 from filesystems:ceph:mimic

Browse Source 
bsc#1076403

OBS-URL: https://build.opensuse.org/request/show/570618
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=158
This commit is contained in:
Nathan Cutler 2018-01-29 13:50:56 +00:00 committed by Git OBS Bridge
parent 5f3b437e17
commit 4b38980876
6 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ceph-13.0.0-5169-g26918cdcc9.tar.bz2
View File

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

3
ceph-13.0.0-5171-g4d4101fe78.tar.bz2 Normal file
View File

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

18
ceph-test.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jan 29 13:46:41 UTC 2018 - ncutler@suse.com
- Update to version 13.0.0-5171-g4d4101fe78:
+ spec file:
* change version number format
* define _defined_if_python2_absent if, and only if, building without
python2 bcond
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 26 19:03:21 UTC 2018 - ncutler@suse.com Fri Jan 26 19:03:21 UTC 2018 - ncutler@suse.com
@ -7,15 +16,14 @@ Fri Jan 26 19:03:21 UTC 2018 - ncutler@suse.com
N.B.: this has the consequence that we no longer build or ship N.B.: this has the consequence that we no longer build or ship
Python 2 versions of the Python bindings for librados, librbd, Python 2 versions of the Python bindings for librados, librbd,
libcephfs and librgw libcephfs and librgw
* use <B_CNT> to prevent OBS from clobbering Release * drop lowmem_builder bcond and rewrite associated code to be distro-agnostic
* rewrite lowmem_builder to be distro-agnostic and drop bcond * move distro-conditional BuildRequires to appropriate section
* move distro-conditional BuildRequires to where they belong
* use more recent toolchain on RHEL 7 * use more recent toolchain on RHEL 7
* put ceph-base runtime dependencies in alphabetical order * ceph-base: put runtime dependencies in alphabetical order
* correct Group for python bindings subpackages * correct Group for python bindings subpackages
* move ceph-volume to ceph-osd and adjust systemd macros accordingly * move ceph-volume to ceph-osd and adjust systemd macros accordingly
* ceph-osd subpackage now requires lvm2 for ceph-volume * ceph-osd subpackage now requires lvm2 for ceph-volume
* peg version of ceph-common dependency * ceph-test: peg version of ceph-common dependency
* drop deprecated scripts rcceph and ceph-crush-location * drop deprecated scripts rcceph and ceph-crush-location
* fix permissions of rbd resource agent * fix permissions of rbd resource agent

12
ceph-test.spec
View File

@ -47,10 +47,12 @@
%endif %endif
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%bcond_with python2 %bcond_with python2
%global _defined_if_python2_absent 1
%else %else
%bcond_without python2 %bcond_without python2
%endif %endif
%if 0%{without python2}
%global _defined_if_python2_absent 1
%endif
%if %{with selinux} %if %{with selinux}
# get selinux policy version # get selinux policy version
@ -74,8 +76,8 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 13.0.0 Version: 13.0.0.5171+g4d4101fe78
Release: 5169.g26918cdcc9%{?dist}.<B_CNT> Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
%endif %endif
@ -90,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-1.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.0-5169-g26918cdcc9.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.0-5171-g4d4101fe78.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -395,7 +397,7 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-13.0.0-5169-g26918cdcc9 %autosetup -p1 -n ceph-13.0.0-5171-g4d4101fe78
%build %build

18
ceph.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jan 29 13:46:41 UTC 2018 - ncutler@suse.com
- Update to version 13.0.0-5171-g4d4101fe78:
+ spec file:
* change version number format
* define _defined_if_python2_absent if, and only if, building without
python2 bcond
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 26 19:03:21 UTC 2018 - ncutler@suse.com Fri Jan 26 19:03:21 UTC 2018 - ncutler@suse.com
@ -7,15 +16,14 @@ Fri Jan 26 19:03:21 UTC 2018 - ncutler@suse.com
N.B.: this has the consequence that we no longer build or ship N.B.: this has the consequence that we no longer build or ship
Python 2 versions of the Python bindings for librados, librbd, Python 2 versions of the Python bindings for librados, librbd,
libcephfs and librgw libcephfs and librgw
* use <B_CNT> to prevent OBS from clobbering Release * drop lowmem_builder bcond and rewrite associated code to be distro-agnostic
* rewrite lowmem_builder to be distro-agnostic and drop bcond * move distro-conditional BuildRequires to appropriate section
* move distro-conditional BuildRequires to where they belong
* use more recent toolchain on RHEL 7 * use more recent toolchain on RHEL 7
* put ceph-base runtime dependencies in alphabetical order * ceph-base: put runtime dependencies in alphabetical order
* correct Group for python bindings subpackages * correct Group for python bindings subpackages
* move ceph-volume to ceph-osd and adjust systemd macros accordingly * move ceph-volume to ceph-osd and adjust systemd macros accordingly
* ceph-osd subpackage now requires lvm2 for ceph-volume * ceph-osd subpackage now requires lvm2 for ceph-volume
* peg version of ceph-common dependency * ceph-test: peg version of ceph-common dependency
* drop deprecated scripts rcceph and ceph-crush-location * drop deprecated scripts rcceph and ceph-crush-location
* fix permissions of rbd resource agent * fix permissions of rbd resource agent

12
ceph.spec
View File

@ -47,10 +47,12 @@
%endif %endif
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%bcond_with python2 %bcond_with python2
%global _defined_if_python2_absent 1
%else %else
%bcond_without python2 %bcond_without python2
%endif %endif
%if 0%{without python2}
%global _defined_if_python2_absent 1
%endif
%if %{with selinux} %if %{with selinux}
# get selinux policy version # get selinux policy version
@ -74,8 +76,8 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 13.0.0 Version: 13.0.0.5171+g4d4101fe78
Release: 5169.g26918cdcc9%{?dist}.<B_CNT> Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
%endif %endif
@ -90,7 +92,7 @@ License: LGPL-2.1 and CC-BY-SA-1.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.0-5169-g26918cdcc9.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.0-5171-g4d4101fe78.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}
@ -827,7 +829,7 @@ python-rbd, python-rgw or python-cephfs instead.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-13.0.0-5169-g26918cdcc9 %autosetup -p1 -n ceph-13.0.0-5171-g4d4101fe78
%build %build