rpms/ceph
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to latest upstream version (0.94.3)

Browse Source 
Resolves: rhbz#1257374
This commit is contained in:
Boris Ranto 2015-08-27 12:41:56 +02:00
parent 222abd2152
commit ac5a29a8ad
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ceph.spec
View File

@ -11,8 +11,8 @@
# common # common
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 0.94.2 Version: 0.94.3
Release: 4%{?dist} Release: 1%{?dist}
Epoch: 1 Epoch: 1
Summary: User space components of the Ceph file system Summary: User space components of the Ceph file system
License: GPLv2 License: GPLv2
@ -27,9 +27,6 @@ Patch3: 0003-Skip-initialization-if-rtdsc-is-not-implemented.patch
# fix build without tcmalloc # fix build without tcmalloc
# https://github.com/ceph/rocksdb/pull/5 # https://github.com/ceph/rocksdb/pull/5
Patch10: ceph-0.94.1-tcmalloc.patch Patch10: ceph-0.94.1-tcmalloc.patch
# Fixes builds against boost 1.58.
# Upstream commit e7b196a4a091c0ea258866559ba06e7ed0cc4247
Patch11: 0001-mon-remove-unused-variable.patch
Requires: librbd1 = %{epoch}:%{version}-%{release} Requires: librbd1 = %{epoch}:%{version}-%{release}
Requires: librados2 = %{epoch}:%{version}-%{release} Requires: librados2 = %{epoch}:%{version}-%{release}
Requires: libcephfs1 = %{epoch}:%{version}-%{release} Requires: libcephfs1 = %{epoch}:%{version}-%{release}
@ -435,7 +432,6 @@ python-cephfs instead.
%patch1 -p1 %patch1 -p1
%patch3 -p1 %patch3 -p1
%patch10 -p1 -b .tcmalloc %patch10 -p1 -b .tcmalloc
%patch11 -p1 -b .boost
%build %build
# Find jni.h # Find jni.h
@ -938,6 +934,10 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
# actually build this meta package. # actually build this meta package.
%changelog %changelog
* Thu Aug 27 2015 Boris Ranto <branto@redhat.com> - 1:0.94.3-1
- Rebase to latest upstream version
- The boost patch got merged upstream and is already present in the release
* Fri Jul 31 2015 Richard W.M. Jones <rjones@redhat.com> - 1:0.94.2-4 * Fri Jul 31 2015 Richard W.M. Jones <rjones@redhat.com> - 1:0.94.2-4
- Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576). - Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576).

2
sources
View File

@ -1 +1 @@
249648d35e634adaaeec727408ca6092 ceph-0.94.2.tar.bz2 ccbaba6cad56cf71719661a0cdcc6ad6 ceph-0.94.3.tar.bz2