[ceph/f21] Rebase to ceph-0.80.8

branto branto at fedoraproject.org
Mon Feb 23 18:15:25 UTC 2015


commit c01db1f5b05bc35b353b34c5842f08929ea32ea3
Author: Boris Ranto <branto at redhat.com>
Date:   Mon Feb 23 19:14:58 2015 +0100

    Rebase to ceph-0.80.8

 ceph.spec | 16 ++++++++--------
 sources   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/ceph.spec b/ceph.spec
index 9c7bf9c..3cb4880 100644
--- a/ceph.spec
+++ b/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 at 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 at redhat.com> - 1:0.80.7-3
 - Fix rhbz#1155335 -- /usr/bin/ceph hangs indefinitely
 
diff --git a/sources b/sources
index 993ebd6..be28633 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc7e46b5804fd5fdb8796416b914c4be  ceph-0.80.7.tar.bz2
+a49eda4890e529568f731e24b0beee30  ceph-0.80.8.tar.bz2


More information about the scm-commits mailing list