Rebase to ceph-0.80.8
This commit is contained in:
parent
8e6771dba7
commit
c01db1f5b0
16
ceph.spec
16
ceph.spec
@ -9,8 +9,8 @@
|
||||
# common
|
||||
#################################################################################
|
||||
Name: ceph
|
||||
Version: 0.80.7
|
||||
Release: 3%{?dist}
|
||||
Version: 0.80.8
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
Summary: User space components of the Ceph file system
|
||||
License: GPLv2
|
||||
@ -20,8 +20,6 @@ Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2
|
||||
Patch0: ceph-google-gperftools.patch
|
||||
Patch1: ceph-no-format-security.patch
|
||||
Patch2: ceph-common-do-not-unlock-rwlock-on-destruction.patch
|
||||
Patch3: ceph-remove-rados-py-destructor.patch
|
||||
Patch4: ceph-call-rados-shutdown-explicitly.patch
|
||||
Requires: librbd1 = %{epoch}:%{version}-%{release}
|
||||
Requires: librados2 = %{epoch}:%{version}-%{release}
|
||||
Requires: libcephfs1 = %{epoch}:%{version}-%{release}
|
||||
@ -68,8 +66,7 @@ BuildRequires: leveldb-devel > 1.2
|
||||
%if ! ( 0%{?rhel} && 0%{?rhel} <= 6 )
|
||||
BuildRequires: xfsprogs-devel
|
||||
%endif
|
||||
# No yasm dependency for now, it causes selinux issues
|
||||
#BuildRequires: yasm
|
||||
BuildRequires: yasm
|
||||
%if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
|
||||
BuildRequires: snappy-devel
|
||||
%endif
|
||||
@ -394,8 +391,6 @@ python-cephfs instead.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
# Find jni.h
|
||||
@ -883,6 +878,11 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
|
||||
%files -n python-ceph-compat
|
||||
|
||||
%changelog
|
||||
* Mon Feb 23 2015 Boris Ranto <branto@redhat.com> - 1:0.80.8-1
|
||||
- Rebase to 0.80.8 release
|
||||
- Require yasm, the yasm-related selinux issue was fixed in .8 release
|
||||
- Patch 3 and 4 are now part of the release
|
||||
|
||||
* Wed Jan 14 2015 Boris Ranto <branto@redhat.com> - 1:0.80.7-3
|
||||
- Fix rhbz#1155335 -- /usr/bin/ceph hangs indefinitely
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user