From 82cca6114c6faf1dcb6580b4d8d7c48c59e4b62f134301b29e81e3602c283d9e Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sat, 14 Apr 2018 21:49:29 +0000 Subject: [PATCH] Accepting request 596565 from filesystems:ceph:mimic 13.0.2-1292 OBS-URL: https://build.opensuse.org/request/show/596565 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=179 --- ceph-13.0.2-1292-g53e40cbaae.tar.bz2 | 3 +++ ceph-13.0.2-980-gd814079503.tar.bz2 | 3 --- ceph-test.changes | 16 ++++++++++++++++ ceph-test.spec | 14 +++++++------- ceph.changes | 16 ++++++++++++++++ ceph.spec | 22 +++++++++++----------- checkin.sh | 2 +- 7 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 ceph-13.0.2-1292-g53e40cbaae.tar.bz2 delete mode 100644 ceph-13.0.2-980-gd814079503.tar.bz2 diff --git a/ceph-13.0.2-1292-g53e40cbaae.tar.bz2 b/ceph-13.0.2-1292-g53e40cbaae.tar.bz2 new file mode 100644 index 0000000..f0d4a86 --- /dev/null +++ b/ceph-13.0.2-1292-g53e40cbaae.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bc0f6ac89e7afae9275961551b596b2452cb562d314ffb09fe1d66457307998 +size 71942584 diff --git a/ceph-13.0.2-980-gd814079503.tar.bz2 b/ceph-13.0.2-980-gd814079503.tar.bz2 deleted file mode 100644 index 1df1faf..0000000 --- a/ceph-13.0.2-980-gd814079503.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65f512e19e1b4f0833a890dbfb3faa3c82c86739f26e722cb3bdf717dd76ac51 -size 67670146 diff --git a/ceph-test.changes b/ceph-test.changes index 8877719..0484e8f 100644 --- a/ceph-test.changes +++ b/ceph-test.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Apr 13 21:49:36 UTC 2018 - ncutler@suse.com + +- Update to 13.0.2-1292-g53e40cbaae: + + based on upstream master 4520d43ada7fb96b808c21647b9f58d9e63f91e8 + + adds new lz4 dependency for OSD + + declares existing e2fsprogs dependency for ceph-disk + +------------------------------------------------------------------- +Fri Apr 13 13:48:07 UTC 2018 - ncutler@suse.com + +- checkin.sh: clone git repo to tempory directory under /tmp because there is a + bug in npm, due to which npm does not find the "ng" binary when the binary is + located inside dir path that contains ":", which is the case with OBS project + checkouts + ------------------------------------------------------------------- Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com diff --git a/ceph-test.spec b/ceph-test.spec index 7361492..fb2302f 100644 --- a/ceph-test.spec +++ b/ceph-test.spec @@ -76,7 +76,7 @@ # main package definition ################################################################################# Name: ceph-test -Version: 13.0.2.980+gd814079503 +Version: 13.0.2.1292+g53e40cbaae Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -92,7 +92,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-13.0.2-980-gd814079503.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-13.0.2-1292-g53e40cbaae.tar.bz2 %if 0%{?suse_version} Source96: checkin.sh Source97: README-checkin.txt @@ -197,6 +197,7 @@ BuildRequires: python%{_python_buildid}-Cython BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: rdma-core-devel +BuildRequires: liblz4-devel >= 1.7 %endif %if 0%{?fedora} || 0%{?rhel} @@ -212,6 +213,7 @@ BuildRequires: redhat-lsb-core BuildRequires: Cython%{_python_buildid} BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-sphinx +BuildRequires: lz4-devel >= 1.7 %endif # python34-... for RHEL, python3-... for all other supported distros %if 0%{?rhel} @@ -282,6 +284,8 @@ This package contains Ceph benchmarks and test tools. %endif %if 0%{with selinux} %endif +%if 0%{?fedora} || 0%{?rhel} +%endif %if 0%{?suse_version} %endif %if 0%{?suse_version} @@ -326,10 +330,6 @@ This package contains Ceph benchmarks and test tools. %endif %if 0%{?suse_version} %endif -%if 0%{?fedora} || 0%{?rhel} -%endif -%if 0%{?suse_version} -%endif %if 0%{?suse_version} %endif %if 0%{?rhel} || 0%{?fedora} @@ -411,7 +411,7 @@ This package contains Ceph benchmarks and test tools. %endif %endif %prep -%autosetup -p1 -n ceph-13.0.2-980-gd814079503 +%autosetup -p1 -n ceph-13.0.2-1292-g53e40cbaae %build diff --git a/ceph.changes b/ceph.changes index 8877719..0484e8f 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Apr 13 21:49:36 UTC 2018 - ncutler@suse.com + +- Update to 13.0.2-1292-g53e40cbaae: + + based on upstream master 4520d43ada7fb96b808c21647b9f58d9e63f91e8 + + adds new lz4 dependency for OSD + + declares existing e2fsprogs dependency for ceph-disk + +------------------------------------------------------------------- +Fri Apr 13 13:48:07 UTC 2018 - ncutler@suse.com + +- checkin.sh: clone git repo to tempory directory under /tmp because there is a + bug in npm, due to which npm does not find the "ng" binary when the binary is + located inside dir path that contains ":", which is the case with OBS project + checkouts + ------------------------------------------------------------------- Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 7d98eda..83246e7 100644 --- a/ceph.spec +++ b/ceph.spec @@ -76,7 +76,7 @@ # main package definition ################################################################################# Name: ceph -Version: 13.0.2.980+gd814079503 +Version: 13.0.2.1292+g53e40cbaae Release: 0%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -92,7 +92,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-13.0.2-980-gd814079503.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-13.0.2-1292-g53e40cbaae.tar.bz2 %if 0%{?suse_version} # _insert_obs_source_lines_here %if 0%{?is_opensuse} @@ -189,6 +189,7 @@ BuildRequires: python%{_python_buildid}-Cython BuildRequires: python%{_python_buildid}-PrettyTable BuildRequires: python%{_python_buildid}-Sphinx BuildRequires: rdma-core-devel +BuildRequires: liblz4-devel >= 1.7 %endif %if 0%{?fedora} || 0%{?rhel} Requires: systemd @@ -204,6 +205,7 @@ BuildRequires: redhat-lsb-core BuildRequires: Cython%{_python_buildid} BuildRequires: python%{_python_buildid}-prettytable BuildRequires: python%{_python_buildid}-sphinx +BuildRequires: lz4-devel >= 1.7 %endif # python34-... for RHEL, python3-... for all other supported distros %if 0%{?rhel} @@ -286,17 +288,23 @@ Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release} %endif Requires: cryptsetup +Requires: e2fsprogs Requires: findutils Requires: grep Requires: logrotate +Requires: parted Requires: psmisc Requires: python%{_python_buildid}-requests Requires: python%{_python_buildid}-setuptools Requires: util-linux Requires: xfsprogs Requires: which +%if 0%{?fedora} || 0%{?rhel} +Requires: gdisk +%endif %if 0%{?suse_version} Recommends: chrony +Requires: gptfdisk Provides: libxio = 1.7 Obsoletes: libxio <= 1.7 %endif @@ -473,14 +481,6 @@ Summary: Ceph Object Storage Daemon Group: System/Filesystems %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} -# for sgdisk, used by ceph-disk -%if 0%{?fedora} || 0%{?rhel} -Requires: gdisk -%endif -%if 0%{?suse_version} -Requires: gptfdisk -%endif -Requires: parted Requires: lvm2 %description osd ceph-osd is the object storage daemon for the Ceph distributed file @@ -845,7 +845,7 @@ python-rbd, python-rgw or python-cephfs instead. # common ################################################################################# %prep -%autosetup -p1 -n ceph-13.0.2-980-gd814079503 +%autosetup -p1 -n ceph-13.0.2-1292-g53e40cbaae %build diff --git a/checkin.sh b/checkin.sh index 348b3b5..d63d319 100644 --- a/checkin.sh +++ b/checkin.sh @@ -88,7 +88,7 @@ if [ -n "$EXISTING" ] ; then CLONE="$EXISTING" else echo "Will make fresh clone of repo ->$REPO<- branch ->$BRANCH<-" - TMPDIR=$(mktemp -d --tmpdir=$BASEDIR) + TMPDIR=$(mktemp -d) echo "Created temporary temporary $TMPDIR" git clone --branch $BRANCH $REPO $TMPDIR CLONE="$TMPDIR"