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
This commit is contained in:
parent
4eac6500cd
commit
82cca6114c
3
ceph-13.0.2-1292-g53e40cbaae.tar.bz2
Normal file
3
ceph-13.0.2-1292-g53e40cbaae.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:4bc0f6ac89e7afae9275961551b596b2452cb562d314ffb09fe1d66457307998
|
||||||
|
size 71942584
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:65f512e19e1b4f0833a890dbfb3faa3c82c86739f26e722cb3bdf717dd76ac51
|
|
||||||
size 67670146
|
|
@ -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
|
Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@
|
|||||||
# main package definition
|
# main package definition
|
||||||
#################################################################################
|
#################################################################################
|
||||||
Name: ceph-test
|
Name: ceph-test
|
||||||
Version: 13.0.2.980+gd814079503
|
Version: 13.0.2.1292+g53e40cbaae
|
||||||
Release: 0%{?dist}
|
Release: 0%{?dist}
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Epoch: 2
|
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
|
Group: System/Filesystems
|
||||||
%endif
|
%endif
|
||||||
URL: http://ceph.com/
|
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}
|
%if 0%{?suse_version}
|
||||||
Source96: checkin.sh
|
Source96: checkin.sh
|
||||||
Source97: README-checkin.txt
|
Source97: README-checkin.txt
|
||||||
@ -197,6 +197,7 @@ BuildRequires: python%{_python_buildid}-Cython
|
|||||||
BuildRequires: python%{_python_buildid}-PrettyTable
|
BuildRequires: python%{_python_buildid}-PrettyTable
|
||||||
BuildRequires: python%{_python_buildid}-Sphinx
|
BuildRequires: python%{_python_buildid}-Sphinx
|
||||||
BuildRequires: rdma-core-devel
|
BuildRequires: rdma-core-devel
|
||||||
|
BuildRequires: liblz4-devel >= 1.7
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
|
|
||||||
@ -212,6 +213,7 @@ BuildRequires: redhat-lsb-core
|
|||||||
BuildRequires: Cython%{_python_buildid}
|
BuildRequires: Cython%{_python_buildid}
|
||||||
BuildRequires: python%{_python_buildid}-prettytable
|
BuildRequires: python%{_python_buildid}-prettytable
|
||||||
BuildRequires: python%{_python_buildid}-sphinx
|
BuildRequires: python%{_python_buildid}-sphinx
|
||||||
|
BuildRequires: lz4-devel >= 1.7
|
||||||
%endif
|
%endif
|
||||||
# python34-... for RHEL, python3-... for all other supported distros
|
# python34-... for RHEL, python3-... for all other supported distros
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
@ -282,6 +284,8 @@ This package contains Ceph benchmarks and test tools.
|
|||||||
%endif
|
%endif
|
||||||
%if 0%{with selinux}
|
%if 0%{with selinux}
|
||||||
%endif
|
%endif
|
||||||
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
|
%endif
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
@ -326,10 +330,6 @@ This package contains Ceph benchmarks and test tools.
|
|||||||
%endif
|
%endif
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version}
|
|
||||||
%endif
|
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?rhel} || 0%{?fedora}
|
%if 0%{?rhel} || 0%{?fedora}
|
||||||
@ -411,7 +411,7 @@ This package contains Ceph benchmarks and test tools.
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n ceph-13.0.2-980-gd814079503
|
%autosetup -p1 -n ceph-13.0.2-1292-g53e40cbaae
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
16
ceph.changes
16
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
|
Thu Apr 12 19:06:20 UTC 2018 - ncutler@suse.com
|
||||||
|
|
||||||
|
22
ceph.spec
22
ceph.spec
@ -76,7 +76,7 @@
|
|||||||
# main package definition
|
# main package definition
|
||||||
#################################################################################
|
#################################################################################
|
||||||
Name: ceph
|
Name: ceph
|
||||||
Version: 13.0.2.980+gd814079503
|
Version: 13.0.2.1292+g53e40cbaae
|
||||||
Release: 0%{?dist}
|
Release: 0%{?dist}
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Epoch: 2
|
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
|
Group: System/Filesystems
|
||||||
%endif
|
%endif
|
||||||
URL: http://ceph.com/
|
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}
|
%if 0%{?suse_version}
|
||||||
# _insert_obs_source_lines_here
|
# _insert_obs_source_lines_here
|
||||||
%if 0%{?is_opensuse}
|
%if 0%{?is_opensuse}
|
||||||
@ -189,6 +189,7 @@ BuildRequires: python%{_python_buildid}-Cython
|
|||||||
BuildRequires: python%{_python_buildid}-PrettyTable
|
BuildRequires: python%{_python_buildid}-PrettyTable
|
||||||
BuildRequires: python%{_python_buildid}-Sphinx
|
BuildRequires: python%{_python_buildid}-Sphinx
|
||||||
BuildRequires: rdma-core-devel
|
BuildRequires: rdma-core-devel
|
||||||
|
BuildRequires: liblz4-devel >= 1.7
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?fedora} || 0%{?rhel}
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
Requires: systemd
|
Requires: systemd
|
||||||
@ -204,6 +205,7 @@ BuildRequires: redhat-lsb-core
|
|||||||
BuildRequires: Cython%{_python_buildid}
|
BuildRequires: Cython%{_python_buildid}
|
||||||
BuildRequires: python%{_python_buildid}-prettytable
|
BuildRequires: python%{_python_buildid}-prettytable
|
||||||
BuildRequires: python%{_python_buildid}-sphinx
|
BuildRequires: python%{_python_buildid}-sphinx
|
||||||
|
BuildRequires: lz4-devel >= 1.7
|
||||||
%endif
|
%endif
|
||||||
# python34-... for RHEL, python3-... for all other supported distros
|
# python34-... for RHEL, python3-... for all other supported distros
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
@ -286,17 +288,23 @@ Requires: librgw2 = %{_epoch_prefix}%{version}-%{release}
|
|||||||
Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
|
Requires: ceph-selinux = %{_epoch_prefix}%{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
Requires: cryptsetup
|
Requires: cryptsetup
|
||||||
|
Requires: e2fsprogs
|
||||||
Requires: findutils
|
Requires: findutils
|
||||||
Requires: grep
|
Requires: grep
|
||||||
Requires: logrotate
|
Requires: logrotate
|
||||||
|
Requires: parted
|
||||||
Requires: psmisc
|
Requires: psmisc
|
||||||
Requires: python%{_python_buildid}-requests
|
Requires: python%{_python_buildid}-requests
|
||||||
Requires: python%{_python_buildid}-setuptools
|
Requires: python%{_python_buildid}-setuptools
|
||||||
Requires: util-linux
|
Requires: util-linux
|
||||||
Requires: xfsprogs
|
Requires: xfsprogs
|
||||||
Requires: which
|
Requires: which
|
||||||
|
%if 0%{?fedora} || 0%{?rhel}
|
||||||
|
Requires: gdisk
|
||||||
|
%endif
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Recommends: chrony
|
Recommends: chrony
|
||||||
|
Requires: gptfdisk
|
||||||
Provides: libxio = 1.7
|
Provides: libxio = 1.7
|
||||||
Obsoletes: libxio <= 1.7
|
Obsoletes: libxio <= 1.7
|
||||||
%endif
|
%endif
|
||||||
@ -473,14 +481,6 @@ Summary: Ceph Object Storage Daemon
|
|||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
%endif
|
%endif
|
||||||
Requires: ceph-base = %{_epoch_prefix}%{version}-%{release}
|
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
|
Requires: lvm2
|
||||||
%description osd
|
%description osd
|
||||||
ceph-osd is the object storage daemon for the Ceph distributed file
|
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
|
# common
|
||||||
#################################################################################
|
#################################################################################
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n ceph-13.0.2-980-gd814079503
|
%autosetup -p1 -n ceph-13.0.2-1292-g53e40cbaae
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@ if [ -n "$EXISTING" ] ; then
|
|||||||
CLONE="$EXISTING"
|
CLONE="$EXISTING"
|
||||||
else
|
else
|
||||||
echo "Will make fresh clone of repo ->$REPO<- branch ->$BRANCH<-"
|
echo "Will make fresh clone of repo ->$REPO<- branch ->$BRANCH<-"
|
||||||
TMPDIR=$(mktemp -d --tmpdir=$BASEDIR)
|
TMPDIR=$(mktemp -d)
|
||||||
echo "Created temporary temporary $TMPDIR"
|
echo "Created temporary temporary $TMPDIR"
|
||||||
git clone --branch $BRANCH $REPO $TMPDIR
|
git clone --branch $BRANCH $REPO $TMPDIR
|
||||||
CLONE="$TMPDIR"
|
CLONE="$TMPDIR"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user