diff --git a/ceph-13.0.0-5169-g26918cdcc9.tar.bz2 b/ceph-13.0.0-5169-g26918cdcc9.tar.bz2 deleted file mode 100644 index 15e131e..0000000 --- a/ceph-13.0.0-5169-g26918cdcc9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66aff823b547279c23fba6ec052b7e86cab0dd656af4b185d42d0774b21aab64 -size 66046512 diff --git a/ceph-13.0.0-5171-g4d4101fe78.tar.bz2 b/ceph-13.0.0-5171-g4d4101fe78.tar.bz2 new file mode 100644 index 0000000..2a9f62d --- /dev/null +++ b/ceph-13.0.0-5171-g4d4101fe78.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:972beb13ac059e03b2063a95b71108ed4475e93adf9eb15145ff869a05d92a48 +size 66034625 diff --git a/ceph-test.changes b/ceph-test.changes index ed72b51..7113591 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -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 @@ -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 Python 2 versions of the Python bindings for librados, librbd, libcephfs and librgw - * use to prevent OBS from clobbering Release - * rewrite lowmem_builder to be distro-agnostic and drop bcond - * move distro-conditional BuildRequires to where they belong + * drop lowmem_builder bcond and rewrite associated code to be distro-agnostic + * move distro-conditional BuildRequires to appropriate section * 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 * move ceph-volume to ceph-osd and adjust systemd macros accordingly * 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 * fix permissions of rbd resource agent diff --git a/ceph-test.spec b/ceph-test.spec index 9f29bc8..a049fe8 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -47,10 +47,12 @@ %endif %if 0%{?suse_version} >= 1500 %bcond_with python2 -%global _defined_if_python2_absent 1 %else %bcond_without python2 %endif +%if 0%{without python2} +%global _defined_if_python2_absent 1 +%endif %if %{with selinux} # get selinux policy version @@ -74,8 +76,8 @@ # main package definition ################################################################################# Name: ceph-test -Version: 13.0.0 -Release: 5169.g26918cdcc9%{?dist}. +Version: 13.0.0.5171+g4d4101fe78 +Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %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 %endif 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} Source96: checkin.sh Source97: README-checkin.txt @@ -395,7 +397,7 @@ This package contains Ceph benchmarks and test tools. %endif %endif %prep -%autosetup -p1 -n ceph-13.0.0-5169-g26918cdcc9 +%autosetup -p1 -n ceph-13.0.0-5171-g4d4101fe78 %build diff --git a/ceph.changes b/ceph.changes index ed72b51..7113591 100644 --- a/ceph.changes +++ b/ceph.changes @@ -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 @@ -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 Python 2 versions of the Python bindings for librados, librbd, libcephfs and librgw - * use to prevent OBS from clobbering Release - * rewrite lowmem_builder to be distro-agnostic and drop bcond - * move distro-conditional BuildRequires to where they belong + * drop lowmem_builder bcond and rewrite associated code to be distro-agnostic + * move distro-conditional BuildRequires to appropriate section * 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 * move ceph-volume to ceph-osd and adjust systemd macros accordingly * 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 * fix permissions of rbd resource agent diff --git a/ceph.spec b/ceph.spec index be0a97c..af66fcc 100644 --- a/ceph.spec +++ b/ceph.spec @@ -47,10 +47,12 @@ %endif %if 0%{?suse_version} >= 1500 %bcond_with python2 -%global _defined_if_python2_absent 1 %else %bcond_without python2 %endif +%if 0%{without python2} +%global _defined_if_python2_absent 1 +%endif %if %{with selinux} # get selinux policy version @@ -74,8 +76,8 @@ # main package definition ################################################################################# Name: ceph -Version: 13.0.0 -Release: 5169.g26918cdcc9%{?dist}. +Version: 13.0.0.5171+g4d4101fe78 +Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %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 %endif 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} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -827,7 +829,7 @@ python-rbd, python-rgw or python-cephfs instead. # common ################################################################################# %prep -%autosetup -p1 -n ceph-13.0.0-5169-g26918cdcc9 +%autosetup -p1 -n ceph-13.0.0-5171-g4d4101fe78 %build