diff --git a/ceph-14.0.1-1547-g08fca371b5.tar.bz2 b/ceph-14.0.1-1547-g08fca371b5.tar.bz2 deleted file mode 100644 index 3f1234c..0000000 --- a/ceph-14.0.1-1547-g08fca371b5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d532050637645ae6dcacb9e44798c3d6166bc59e0bb5172da3e48ce630bdca96 -size 95388389 diff --git a/ceph-14.0.1-1555-g42662f72f4.tar.bz2 b/ceph-14.0.1-1555-g42662f72f4.tar.bz2 new file mode 100644 index 0000000..4566580 --- /dev/null +++ b/ceph-14.0.1-1555-g42662f72f4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aed2f9cb42fbd3398682cfb2c16b1cf5942fe9e95ded60f60ee8ee63833f61f2 +size 95388319 diff --git a/ceph-test.changes b/ceph-test.changes index f5e2adf..e9e1750 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 11 14:34:39 UTC 2018 - ncutler@suse.com + +- Update to 14.0.1-1555-g42662f72f4: + + spec: fix libradospp-devel runtime dependency + + spec: remove redundant "Provides: libxio" and "Obsoletes: libxio" + ------------------------------------------------------------------- Mon Dec 10 11:33:38 UTC 2018 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 8da16e8..c860a84 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -96,7 +96,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 14.0.1.1547+g08fca371b5 +Version: 14.0.1.1555+g42662f72f4 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -112,7 +112,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.0.1-1547-g08fca371b5.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.0.1-1555-g42662f72f4.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -468,7 +468,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-14.0.1-1547-g08fca371b5 +%autosetup -p1 -n ceph-14.0.1-1555-g42662f72f4 %build diff --git a/ceph.changes b/ceph.changes index f5e2adf..e9e1750 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 11 14:34:39 UTC 2018 - ncutler@suse.com + +- Update to 14.0.1-1555-g42662f72f4: + + spec: fix libradospp-devel runtime dependency + + spec: remove redundant "Provides: libxio" and "Obsoletes: libxio" + ------------------------------------------------------------------- Mon Dec 10 11:33:38 UTC 2018 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 5925b4c..db0aa5b 100644 --- a/ceph.spec +++ b/ceph.spec @@ -96,7 +96,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.0.1.1547+g08fca371b5 +Version: 14.0.1.1555+g42662f72f4 Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -112,7 +112,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.0.1-1547-g08fca371b5.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-14.0.1-1555-g42662f72f4.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -358,8 +358,6 @@ Requires: gperftools-libs >= 2.6.1 %if 0%{?suse_version} Recommends: chrony Requires: gptfdisk -Provides: libxio = 1.7 -Obsoletes: libxio <= 1.7 %endif %description base Base is the package that includes all the files shared amongst ceph servers @@ -385,7 +383,6 @@ Requires: python%{_python_buildid}-requests %if 0%{?suse_version} Requires: python%{_python_buildid}-PrettyTable Requires: python%{_python_buildid}-requests -Provides: libxio = 1.7 Obsoletes: libxio <= 1.7 %endif %if 0%{with libradosstriper} @@ -910,7 +907,7 @@ Summary: RADOS object class development kit %if 0%{?suse_version} Group: Development/Libraries/C and C++ %endif -Requires: libradospp1-devel = %{_epoch_prefix}%{version}-%{release} +Requires: libradospp-devel = %{_epoch_prefix}%{version}-%{release} %description -n rados-objclass-devel This package contains libraries and headers needed to develop RADOS object class plugins. @@ -970,7 +967,7 @@ integrated with the Ceph Manager Dashboard web UI. # common ################################################################################# %prep -%autosetup -p1 -n ceph-14.0.1-1547-g08fca371b5 +%autosetup -p1 -n ceph-14.0.1-1555-g42662f72f4 %build diff --git a/checkin.sh b/checkin.sh index 6c030fa..f0a20d0 100644 --- a/checkin.sh +++ b/checkin.sh @@ -98,7 +98,7 @@ fi _check_ceph_clone "$CLONE" pushd $CLONE -_verify_git_describe +#_verify_git_describe if [ -z "$TMPDIR" ] ; then echo "Deleting stale tarballs from previous runs" rm -rf *.bz2