diff --git a/ceph-13.0.0-3531-g3692e00bab.tar.bz2 b/ceph-13.0.0-3531-g3692e00bab.tar.bz2 new file mode 100644 index 0000000..6fd37f7 --- /dev/null +++ b/ceph-13.0.0-3531-g3692e00bab.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:160929fa7e540b29ea8b434eae1c06f3f740c249ddbd1d72786adb3fa1cd72cc +size 64159227 diff --git a/ceph-13.0.0-3531-g9dbb709d3f.tar.bz2 b/ceph-13.0.0-3531-g9dbb709d3f.tar.bz2 deleted file mode 100644 index 0a9d3ff..0000000 --- a/ceph-13.0.0-3531-g9dbb709d3f.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ddb1fa8b5f9dad43b4d99118572e3ab9e6cfb8ac1a846cde6d00a6b467abc22 -size 64159773 diff --git a/ceph-test.changes b/ceph-test.changes index 5252679..ee8f075 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sat Nov 25 14:31:00 UTC 2017 - ncutler@suse.com -- Update to version 13.0.0-3531.g9dbb709d3f: +- Update to version 13.0.0-3531.g3692e00bab: + rebase to latest upstream master + Add "checkin.sh" script to automate the checkin process, along with a "README-checkin.txt" file containing basic information. diff --git a/ceph-test.spec b/ceph-test.spec index b9f3448..f5b7c2b 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -63,7 +63,7 @@ ################################################################################# Name: ceph-test Version: 13.0.0 -Release: 3531.g9dbb709d3f%{?dist} +Release: 3531.g3692e00bab%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -78,13 +78,16 @@ 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: ceph-%{version}.tar.bz2 +%if 0%{?fedora} || 0%{?rhel} +Source0: https://download.ceph.com/tarballs/ceph-13.0.0-3531-g3692e00bab.tar.bz2 +%endif +%if 0%{?suse_version} +Source0: ceph-13.0.0-3531-g3692e00bab.tar.bz2 Source96: checkin.sh Source97: README-checkin.txt Source98: README-ceph-test.txt Source99: ceph-rpmlintrc # _insert_obs_source_lines_here -%if 0%{?suse_version} %if 0%{?is_opensuse} ExclusiveArch: x86_64 aarch64 ppc64 ppc64le %else @@ -359,7 +362,7 @@ This package contains Ceph benchmarks and test tools. %if 0%{?suse_version} %endif %prep -%autosetup -p1 -n ceph-13.0.0-3531-g9dbb709d3f +%autosetup -p1 -n ceph-13.0.0-3531-g3692e00bab %build %if 0%{with cephfs_java} diff --git a/ceph.changes b/ceph.changes index 5252679..ee8f075 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sat Nov 25 14:31:00 UTC 2017 - ncutler@suse.com -- Update to version 13.0.0-3531.g9dbb709d3f: +- Update to version 13.0.0-3531.g3692e00bab: + rebase to latest upstream master + Add "checkin.sh" script to automate the checkin process, along with a "README-checkin.txt" file containing basic information. diff --git a/ceph.spec b/ceph.spec index ae57d8b..8966cf6 100644 --- a/ceph.spec +++ b/ceph.spec @@ -63,7 +63,7 @@ ################################################################################# Name: ceph Version: 13.0.0 -Release: 3531.g9dbb709d3f%{?dist} +Release: 3531.g3692e00bab%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -78,9 +78,12 @@ 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: %{name}-%{version}.tar.bz2 -# _insert_obs_source_lines_here +%if 0%{?fedora} || 0%{?rhel} +Source0: https://download.ceph.com/tarballs/ceph-13.0.0-3531-g3692e00bab.tar.bz2 +%endif %if 0%{?suse_version} +Source0: ceph-13.0.0-3531-g3692e00bab.tar.bz2 +# _insert_obs_source_lines_here %if 0%{?is_opensuse} ExclusiveArch: x86_64 aarch64 ppc64 ppc64le %else @@ -787,7 +790,7 @@ python-rbd, python-rgw or python-cephfs instead. # common ################################################################################# %prep -%autosetup -p1 -n ceph-13.0.0-3531-g9dbb709d3f +%autosetup -p1 -n ceph-13.0.0-3531-g3692e00bab %build %if 0%{with cephfs_java}