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

Accepting request 572046 from filesystems:ceph:mimic

Browse Source 
%bcond_without python2

OBS-URL: https://build.opensuse.org/request/show/572046
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=159
This commit is contained in:
Nathan Cutler 2018-02-02 14:40:24 +00:00 committed by Git OBS Bridge
parent 4b38980876
commit 2ac02493de
6 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
ceph-13.0.1-1567-gae149ea5f9.tar.bz2 Normal file
View File

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

9
ceph-test.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Feb 2 11:17:07 UTC 2018 - ncutler@suse.com
- Update to version 13.0.1-1567-gae149ea5f9:
+ increment upstream version number to 13.0.1 (mimic dev release)
+ spec file:
* enable --without-python2 bcond for all distros (the Build Service will
control py2/3 build via this option)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 29 13:46:41 UTC 2018 - ncutler@suse.com Mon Jan 29 13:46:41 UTC 2018 - ncutler@suse.com

12
ceph-test.spec
View File

@ -45,11 +45,7 @@
%endif %endif
%endif %endif
%endif %endif
%if 0%{?suse_version} >= 1500
%bcond_with python2
%else
%bcond_without python2 %bcond_without python2
%endif
%if 0%{without python2} %if 0%{without python2}
%global _defined_if_python2_absent 1 %global _defined_if_python2_absent 1
%endif %endif
@ -76,7 +72,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph-test Name: ceph-test
Version: 13.0.0.5171+g4d4101fe78 Version: 13.0.1.1567+gae149ea5f9
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -92,7 +88,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-5171-g4d4101fe78.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.1-1567-gae149ea5f9.tar.bz2
%if 0%{?suse_version} %if 0%{?suse_version}
Source96: checkin.sh Source96: checkin.sh
Source97: README-checkin.txt Source97: README-checkin.txt
@ -397,7 +393,7 @@ This package contains Ceph benchmarks and test tools.
%endif %endif
%endif %endif
%prep %prep
%autosetup -p1 -n ceph-13.0.0-5171-g4d4101fe78 %autosetup -p1 -n ceph-13.0.1-1567-gae149ea5f9
%build %build
@ -459,6 +455,7 @@ cmake .. \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-DWITH_EMBEDDED=OFF \ -DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \ -DWITH_MANPAGE=ON \
-DWITH_SYSTEMD=ON \
-DWITH_PYTHON3=ON \ -DWITH_PYTHON3=ON \
%if %{with python2} %if %{with python2}
-DWITH_PYTHON2=ON \ -DWITH_PYTHON2=ON \
@ -466,7 +463,6 @@ cmake .. \
-DWITH_PYTHON2=OFF \ -DWITH_PYTHON2=OFF \
-DMGR_PYTHON_VERSION=3 \ -DMGR_PYTHON_VERSION=3 \
%endif %endif
-DWITH_SYSTEMD=ON \
%if 0%{?rhel} && ! 0%{?centos} %if 0%{?rhel} && ! 0%{?centos}
-DWITH_SUBMAN=ON \ -DWITH_SUBMAN=ON \
%endif %endif

9
ceph.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Feb 2 11:17:07 UTC 2018 - ncutler@suse.com
- Update to version 13.0.1-1567-gae149ea5f9:
+ increment upstream version number to 13.0.1 (mimic dev release)
+ spec file:
* enable --without-python2 bcond for all distros (the Build Service will
control py2/3 build via this option)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 29 13:46:41 UTC 2018 - ncutler@suse.com Mon Jan 29 13:46:41 UTC 2018 - ncutler@suse.com

12
ceph.spec
View File

@ -45,11 +45,7 @@
%endif %endif
%endif %endif
%endif %endif
%if 0%{?suse_version} >= 1500
%bcond_with python2
%else
%bcond_without python2 %bcond_without python2
%endif
%if 0%{without python2} %if 0%{without python2}
%global _defined_if_python2_absent 1 %global _defined_if_python2_absent 1
%endif %endif
@ -76,7 +72,7 @@
# main package definition # main package definition
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 13.0.0.5171+g4d4101fe78 Version: 13.0.1.1567+gae149ea5f9
Release: 0%{?dist} Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
Epoch: 2 Epoch: 2
@ -92,7 +88,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-5171-g4d4101fe78.tar.bz2 Source0: %{?_remote_tarball_prefix}ceph-13.0.1-1567-gae149ea5f9.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}
@ -829,7 +825,7 @@ python-rbd, python-rgw or python-cephfs instead.
# common # common
################################################################################# #################################################################################
%prep %prep
%autosetup -p1 -n ceph-13.0.0-5171-g4d4101fe78 %autosetup -p1 -n ceph-13.0.1-1567-gae149ea5f9
%build %build
@ -891,6 +887,7 @@ cmake .. \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-DWITH_EMBEDDED=OFF \ -DWITH_EMBEDDED=OFF \
-DWITH_MANPAGE=ON \ -DWITH_MANPAGE=ON \
-DWITH_SYSTEMD=ON \
-DWITH_PYTHON3=ON \ -DWITH_PYTHON3=ON \
%if %{with python2} %if %{with python2}
-DWITH_PYTHON2=ON \ -DWITH_PYTHON2=ON \
@ -898,7 +895,6 @@ cmake .. \
-DWITH_PYTHON2=OFF \ -DWITH_PYTHON2=OFF \
-DMGR_PYTHON_VERSION=3 \ -DMGR_PYTHON_VERSION=3 \
%endif %endif
-DWITH_SYSTEMD=ON \
%if 0%{?rhel} && ! 0%{?centos} %if 0%{?rhel} && ! 0%{?centos}
-DWITH_SUBMAN=ON \ -DWITH_SUBMAN=ON \
%endif %endif