From ac5a29a8ad9a17a103fbd26c9c93c0213a5c005f Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Thu, 27 Aug 2015 12:41:56 +0200 Subject: [PATCH] Rebase to latest upstream version (0.94.3) Resolves: rhbz#1257374 --- ceph.spec | 12 ++++++------ sources | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ceph.spec b/ceph.spec index a526652..e05c62f 100644 --- a/ceph.spec +++ b/ceph.spec @@ -11,8 +11,8 @@ # common ################################################################################# Name: ceph -Version: 0.94.2 -Release: 4%{?dist} +Version: 0.94.3 +Release: 1%{?dist} Epoch: 1 Summary: User space components of the Ceph file system License: GPLv2 @@ -27,9 +27,6 @@ Patch3: 0003-Skip-initialization-if-rtdsc-is-not-implemented.patch # fix build without tcmalloc # https://github.com/ceph/rocksdb/pull/5 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: librados2 = %{epoch}:%{version}-%{release} Requires: libcephfs1 = %{epoch}:%{version}-%{release} @@ -435,7 +432,6 @@ python-cephfs instead. %patch1 -p1 %patch3 -p1 %patch10 -p1 -b .tcmalloc -%patch11 -p1 -b .boost %build # Find jni.h @@ -938,6 +934,10 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 # actually build this meta package. %changelog +* Thu Aug 27 2015 Boris Ranto - 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 - 1:0.94.2-4 - Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576). diff --git a/sources b/sources index 5a2ad72..46a8cd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -249648d35e634adaaeec727408ca6092 ceph-0.94.2.tar.bz2 +ccbaba6cad56cf71719661a0cdcc6ad6 ceph-0.94.3.tar.bz2