From 2ac02493defe9b73e04a18bb576d94438e133279ca89c586f059c00e5e941740 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 2 Feb 2018 14:40:24 +0000 Subject: [PATCH] Accepting request 572046 from filesystems:ceph:mimic %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 --- ceph-13.0.0-5171-g4d4101fe78.tar.bz2 | 3 --- ceph-13.0.1-1567-gae149ea5f9.tar.bz2 | 3 +++ ceph-test.changes | 9 +++++++++ ceph-test.spec | 12 ++++-------- ceph.changes | 9 +++++++++ ceph.spec | 12 ++++-------- 6 files changed, 29 insertions(+), 19 deletions(-) delete mode 100644 ceph-13.0.0-5171-g4d4101fe78.tar.bz2 create mode 100644 ceph-13.0.1-1567-gae149ea5f9.tar.bz2 diff --git a/ceph-13.0.0-5171-g4d4101fe78.tar.bz2 b/ceph-13.0.0-5171-g4d4101fe78.tar.bz2 deleted file mode 100644 index 2a9f62d..0000000 --- a/ceph-13.0.0-5171-g4d4101fe78.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:972beb13ac059e03b2063a95b71108ed4475e93adf9eb15145ff869a05d92a48 -size 66034625 diff --git a/ceph-13.0.1-1567-gae149ea5f9.tar.bz2 b/ceph-13.0.1-1567-gae149ea5f9.tar.bz2 new file mode 100644 index 0000000..7eaeddf --- /dev/null +++ b/ceph-13.0.1-1567-gae149ea5f9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e38cd7363029061f4f7e7cc7ad44a645dcf0a2ea4e54577b11bb97441e71846 +size 66046211 diff --git a/ceph-test.changes b/ceph-test.changes index 7113591..a479487 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -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 diff --git a/ceph-test.spec b/ceph-test.spec index a049fe8..84769d8 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -45,11 +45,7 @@ %endif %endif %endif -%if 0%{?suse_version} >= 1500 -%bcond_with python2 -%else %bcond_without python2 -%endif %if 0%{without python2} %global _defined_if_python2_absent 1 %endif @@ -76,7 +72,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 13.0.0.5171+g4d4101fe78 +Version: 13.0.1.1567+gae149ea5f9 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} 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 %endif 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} Source96: checkin.sh Source97: README-checkin.txt @@ -397,7 +393,7 @@ This package contains Ceph benchmarks and test tools. %endif %endif %prep -%autosetup -p1 -n ceph-13.0.0-5171-g4d4101fe78 +%autosetup -p1 -n ceph-13.0.1-1567-gae149ea5f9 %build @@ -459,6 +455,7 @@ cmake .. \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DWITH_EMBEDDED=OFF \ -DWITH_MANPAGE=ON \ + -DWITH_SYSTEMD=ON \ -DWITH_PYTHON3=ON \ %if %{with python2} -DWITH_PYTHON2=ON \ @@ -466,7 +463,6 @@ cmake .. \ -DWITH_PYTHON2=OFF \ -DMGR_PYTHON_VERSION=3 \ %endif - -DWITH_SYSTEMD=ON \ %if 0%{?rhel} && ! 0%{?centos} -DWITH_SUBMAN=ON \ %endif diff --git a/ceph.changes b/ceph.changes index 7113591..a479487 100644 --- a/ceph.changes +++ b/ceph.changes @@ -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 diff --git a/ceph.spec b/ceph.spec index af66fcc..11cd036 100644 --- a/ceph.spec +++ b/ceph.spec @@ -45,11 +45,7 @@ %endif %endif %endif -%if 0%{?suse_version} >= 1500 -%bcond_with python2 -%else %bcond_without python2 -%endif %if 0%{without python2} %global _defined_if_python2_absent 1 %endif @@ -76,7 +72,7 @@ # main package definition ################################################################################# Name: ceph -Version: 13.0.0.5171+g4d4101fe78 +Version: 13.0.1.1567+gae149ea5f9 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} 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 %endif 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} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -829,7 +825,7 @@ python-rbd, python-rgw or python-cephfs instead. # common ################################################################################# %prep -%autosetup -p1 -n ceph-13.0.0-5171-g4d4101fe78 +%autosetup -p1 -n ceph-13.0.1-1567-gae149ea5f9 %build @@ -891,6 +887,7 @@ cmake .. \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DWITH_EMBEDDED=OFF \ -DWITH_MANPAGE=ON \ + -DWITH_SYSTEMD=ON \ -DWITH_PYTHON3=ON \ %if %{with python2} -DWITH_PYTHON2=ON \ @@ -898,7 +895,6 @@ cmake .. \ -DWITH_PYTHON2=OFF \ -DMGR_PYTHON_VERSION=3 \ %endif - -DWITH_SYSTEMD=ON \ %if 0%{?rhel} && ! 0%{?centos} -DWITH_SUBMAN=ON \ %endif