New release (1:0.94.7-2)

- Workaround xfs.h check
New version (1:0.94.7-1)
2016-05-16 20:56:12 +02:00 · 2016-05-16 15:49:01 +02:00 · 2016-02-23 18:10:02 +01:00 · 2015-12-09 13:52:04 +01:00 · 2015-10-27 16:05:32 +01:00 · 2015-10-20 14:49:23 +02:00
9 changed files with 584 additions and 156 deletions
@@ -0,0 +1,29 @@
+From 8ac49f54ad774324c1de344cd18620df7fa52256 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Wed, 15 Apr 2015 14:06:24 +0200
+Subject: [PATCH] Disable erasure_codelib neon build
+
+---
+ src/erasure-code/jerasure/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am
+index 9ca4fbb..147d57e 100644
+--- a/src/erasure-code/jerasure/Makefile.am
+++ b/src/erasure-code/jerasure/Makefile.am
+@@ -75,9 +75,9 @@ if LINUX
+ libec_jerasure_neon_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
+ endif
+ 
+-if HAVE_NEON
+-erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
+-endif
+#if HAVE_NEON
+#erasure_codelib_LTLIBRARIES += libec_jerasure_neon.la
+#endif
+ 
+ libec_jerasure_sse3_la_SOURCES = ${jerasure_sources}
+ libec_jerasure_sse3_la_CFLAGS = ${AM_CFLAGS}  \
+-- 
+2.5.5
+
@@ -0,0 +1,37 @@
+From 726127dbd6d51c97495e73c3216c27dd38a31ed3 Mon Sep 17 00:00:00 2001
+From: Anthony Alba <ascanio.alba7@gmail.com>
+Date: Mon, 30 Nov 2015 16:44:31 +0800
+Subject: [PATCH] init-ceph.in: Allow custom cluster names during startup.
+
+Signed-off-by: Richard Chan <richard@treeboxsolutions.com>
+---
+ src/init-ceph.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/init-ceph.in b/src/init-ceph.in
+index e4cea7e..1f19ffa 100644
+--- a/src/init-ceph.in
+++ b/src/init-ceph.in
+@@ -288,7 +288,7 @@ for name in $what; do
+ 	lockfile=""
+     fi
+ 
+-    get_conf asok "$run_dir/ceph-$type.$id.asok" "admin socket"
+    get_conf asok "$run_dir/$cluster-$type.$id.asok" "admin socket"
+ 
+     case "$command" in
+ 	start)
+@@ -404,8 +404,8 @@ for name in $what; do
+ 		# these keys.  it's also true for legacy installs
+ 		# via mkcephfs, which is fine too; there is no harm
+ 		# in creating these keys.
+-		get_conf mon_data "/var/lib/ceph/mon/ceph-$id" "mon data"
+-		if [ "$mon_data" = "/var/lib/ceph/mon/ceph-$id" -a "$asok" = "/var/run/ceph/ceph-mon.$id.asok" ]; then
+		get_conf mon_data "/var/lib/ceph/mon/$cluster-$id" "mon data"
+		if [ "$mon_data" = "/var/lib/ceph/mon/$cluster-$id" -a "$asok" = "/var/run/ceph/$cluster-mon.$id.asok" ]; then
+ 		    echo Starting ceph-create-keys on $host...
+ 		    cmd2="$SBINDIR/ceph-create-keys --cluster $cluster -i $id 2> /dev/null &"
+ 		    do_cmd "$cmd2"
+-- 
+2.5.5
+
@@ -0,0 +1,26 @@
+From ebff005e9998122c9e89052fbca06f4962180240 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Mon, 16 May 2016 15:47:20 +0200
+Subject: [PATCH] Apply 'ceph-0.94.1-tcmalloc.patch'
+
+Signed-off-by: Boris Ranto <branto@redhat.com>
+---
+ src/rocksdb/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rocksdb/configure.ac b/src/rocksdb/configure.ac
+index 855c6a8..fe914aa 100644
+--- a/src/rocksdb/configure.ac
+++ b/src/rocksdb/configure.ac
+@@ -19,7 +19,7 @@ AC_CHECK_LIB([snappy], [snappy_compress], [HAVE_LIBSNAPPY=yes], [AC_MSG_FAILURE(
+ AC_CHECK_LIB([z], [gzread], [HAVE_LIBZ=yes], [AC_MSG_FAILURE([libz not found])])
+ AC_CHECK_LIB([bz2], [BZ2_bzCompressInit], [HAVE_LIBBZ2=yes], [AC_MSG_FAILURE([libbz2 not found])])
+ AC_CHECK_LIB([rt], [clock_gettime], [HAVE_LIBRT=yes], [AC_MSG_FAILURE([librt not found])])
+-AC_CHECK_LIB([tcmalloc], [malloc],  [HAVE_LIBTCMALLOC=yes],[AC_MSG_FAILURE([no tcmalloc found ])])
+AC_CHECK_LIB([tcmalloc], [malloc],  [HAVE_LIBTCMALLOC=yes],[AC_MSG_RESULT([no tcmalloc found ])])
+ 
+ OLD_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -std=c++11"
+-- 
+2.5.5
+
@@ -0,0 +1,32 @@
+From ecc0e801e378310dbb0e60ae7eb1f19179bd3e9e Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Mon, 16 May 2016 15:48:23 +0200
+Subject: [PATCH] Apply 'init-ceph.in-fedora.patch'
+
+Signed-off-by: Boris Ranto <branto@redhat.com>
+---
+ src/init-ceph.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/init-ceph.in b/src/init-ceph.in
+index 1f19ffa..78eaf97 100644
+--- a/src/init-ceph.in
+++ b/src/init-ceph.in
+@@ -1,11 +1,11 @@
+ #!/bin/sh
+ # Start/stop ceph daemons
+-# chkconfig: 2345 60 80
+# chkconfig: - 60 80
+ 
+ ### BEGIN INIT INFO
+ # Provides:          ceph
+-# Default-Start:     2 3 4 5
+-# Default-Stop:      0 1 6
+# Default-Start:
+# Default-Stop:
+ # Required-Start:    $remote_fs $named $network $time
+ # Required-Stop:     $remote_fs $named $network $time
+ # Short-Description: Start Ceph distributed file system daemons at boot time
+-- 
+2.5.5
+
@@ -0,0 +1,36 @@
+From d02ac8fd60e692da2257a1d963279091ef47e312 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Mon, 16 May 2016 20:53:28 +0200
+Subject: [PATCH] Workaround xfs.h check
+
+The check for <xfs/xfs.h> in fedora 23 is broken. See e.g.:
+
+http://www.spinics.net/lists/ceph-devel/msg29467.html
+
+This should not be too critical and the package should build just fine
+anyway. Commenting out the bits that check for xfs.h should help us,
+here.
+
+Signed-off-by: Boris Ranto <branto@redhat.com>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d1f98aa..e068fdb 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -814,8 +814,8 @@ AC_ARG_WITH([libxfs],
+   [with_libxfs=yes])
+ AS_IF([test "x$with_libxfs" != "xno"], [
+   # xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
+-  AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
+-    [xfs/xfs.h not found (--without-libxfs to disable)]))
+  #AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
+  #  [xfs/xfs.h not found (--without-libxfs to disable)]))
+   AC_MSG_CHECKING([for XFS_XFLAG_EXTSIZE in xfs/xfs.h])
+   AC_EGREP_CPP([yes_have_xfs_xflag_extsize], [
+     #include <xfs/xfs.h>
+-- 
+2.5.5
+
@@ -1,13 +0,0 @@
--- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig	2014-08-15 16:05:00.161794290 +0200
-+++ ceph-0.80.5/src/perfglue/heap_profiler.cc	2014-08-15 16:05:04.691794305 +0200
-@@ -12,8 +12,8 @@
-  * 
-  */
- 
-#include <google/heap-profiler.h>
-#include <google/malloc_extension.h>
-+#include <gperftools/heap-profiler.h>
-+#include <gperftools/malloc_extension.h>
- #include "heap_profiler.h"
- #include "common/environment.h"
- #include "common/LogClient.h"
@@ -1,11 +0,0 @@
--- ceph-0.80.5/src/test/Makefile.am.orig	2014-08-15 16:30:18.831799418 +0200
-+++ ceph-0.80.5/src/test/Makefile.am	2014-08-15 16:23:17.758464663 +0200
-@@ -642,7 +642,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
- if LINUX
- ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
- ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
-+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
- bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
- endif
- 
@@ -5,60 +5,74 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif

+%global _hardened_build 1
+
 #################################################################################
 # common
 #################################################################################
 Name:		ceph
-Version:	0.80.5
-Release:	6%{?dist}
+Version:	0.94.7
+Release:	2%{?dist}
 Epoch:		1
 Summary:	User space components of the Ceph file system
-License:	GPL-2.0
+License:	GPLv2
 Group:		System Environment/Base
 URL:		http://ceph.com/
-Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
-Patch0:		ceph-google-gperftools.patch
-Patch1:		ceph-no-format-security.patch
+Source0:	http://ceph.com/download/%{name}-%{version}.tar.gz
+Patch1: 0001-Disable-erasure_codelib-neon-build.patch
+Patch2: 0002-init-ceph.in-Allow-custom-cluster-names-during-start.patch
+Patch3: 0003-Apply-ceph-0.94.1-tcmalloc.patch.patch
+Patch4: 0004-Apply-init-ceph.in-fedora.patch.patch
+Patch5: 0005-Workaround-xfs.h-check.patch
+%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
+%endif
+# fix build without tcmalloc
+# https://github.com/ceph/rocksdb/pull/5
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
 Requires:	ceph-common = %{epoch}:%{version}-%{release}
+Requires:	python-rados = %{epoch}:%{version}-%{release}
+Requires:	python-rbd = %{epoch}:%{version}-%{release}
+Requires:	python-cephfs = %{epoch}:%{version}-%{release}
 Requires:	python
 Requires:	python-argparse
-Requires:	python-ceph
 Requires:	python-requests
-%if ! ( 0%{?rhel} && 0%{?rhel} <= 6 )
+Requires:	python-flask
 Requires:	xfsprogs
-%endif
-Requires:	cryptsetup
 Requires:	parted
 Requires:	util-linux
 Requires:	hdparm
-# For initscript
-Requires:	redhat-lsb-core
+Requires:	cryptsetup
 Requires(post):	binutils
-BuildRequires:	make
 BuildRequires:	gcc-c++
-BuildRequires:	libtool
 BuildRequires:	boost-devel
-BuildRequires:	bzip2-devel
-BuildRequires:	libedit-devel
-BuildRequires:	perl
+BuildRequires:  bzip2-devel
+BuildRequires:	cryptsetup
 BuildRequires:	gdbm
-BuildRequires:	pkgconfig
-BuildRequires:	python
-BuildRequires:	python-nose
-BuildRequires:	python-argparse
+BuildRequires:	hdparm
 BuildRequires:	libaio-devel
 BuildRequires:	libcurl-devel
+BuildRequires:	libedit-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	libblkid-devel >= 2.17
 BuildRequires:	libudev-devel
+BuildRequires:	libtool
 BuildRequires:	leveldb-devel > 1.2
-%if ! ( 0%{?rhel} && 0%{?rhel} <= 6 )
+BuildRequires:	make
+BuildRequires:	perl
+BuildRequires:	parted
+BuildRequires:	pkgconfig
+BuildRequires:	python
+BuildRequires:	python-argparse
+BuildRequires:	python-nose
+BuildRequires:	python-requests
+BuildRequires:	python-virtualenv
+BuildRequires:	util-linux
+BuildRequires:	xfsprogs
 BuildRequires:	xfsprogs-devel
-%endif
+BuildRequires:	xmlstarlet
 BuildRequires:	yasm
 %if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
 BuildRequires:	snappy-devel
@@ -67,7 +81,7 @@ BuildRequires:	snappy-devel
 #################################################################################
 # specific
 #################################################################################
-%if ! 0%{?rhel}
+%if ! 0%{?rhel} || 0%{?fedora}
 BuildRequires:	sharutils
 %endif

@@ -94,7 +108,7 @@ Requires:	gdisk
 Requires(post):	chkconfig
 Requires(preun):chkconfig
 Requires(preun):initscripts
-%ifnarch ppc ppc64 s390 s390x
+%ifnarch s390 s390x
 BuildRequires:	gperftools-devel
 %endif
 %endif
@@ -113,11 +127,13 @@ Summary:	Ceph Common
 Group:		System Environment/Base
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados2 = %{epoch}:%{version}-%{release}
-Requires:	python-ceph = %{epoch}:%{version}-%{release}
+Requires:	python-rados = %{epoch}:%{version}-%{release}
+Requires:	python-rbd = %{epoch}:%{version}-%{release}
+Requires:	python-cephfs = %{epoch}:%{version}-%{release}
 Requires:	python-requests
 Requires:	redhat-lsb-core
 %description -n ceph-common
-common utilities to mount and interact with a ceph storage cluster
+Common utilities to mount and interact with a ceph storage cluster.

 %package fuse
 Summary:	Ceph fuse-based client
@@ -137,19 +153,6 @@ BuildRequires:	fuse-devel
 %description -n rbd-fuse
 FUSE based client to map Ceph rbd images to files

-%package devel
-Summary:	Ceph headers
-Group:		Development/Libraries
-License:	LGPL-2.0
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	librados2 = %{epoch}:%{version}-%{release}
-Requires:	librbd1 = %{epoch}:%{version}-%{release}
-Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
-Requires:	libcephfs_jni1 = %{epoch}:%{version}-%{release}
-%description devel
-This package contains libraries and headers needed to develop programs
-that use Ceph.
-
 %package radosgw
 Summary:	Rados REST gateway
 Group:		Development/Libraries
@@ -164,8 +167,8 @@ BuildRequires:	expat-devel
 BuildRequires:	fcgi-devel
 %endif
 %description radosgw
-radosgw is an S3 HTTP REST gateway for the RADOS object store. It is
-implemented as a FastCGI module using libfcgi, and can be used in
+This package is an S3 HTTP REST gateway for the RADOS object store. It
+is implemented as a FastCGI module using libfcgi, and can be used in
 conjunction with any FastCGI capable web server.

 %if %{with ocf}
@@ -186,7 +189,7 @@ Summary:	RADOS distributed object store client library
 Group:		System Environment/Libraries
 License:	LGPL-2.0
 %if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
-Obsoletes:	ceph-libs < 1:0.80.5
+Obsoletes:	ceph-libs < %{epoch}:%{version}-%{release}
 %endif
 %description -n librados2
 RADOS is a reliable, autonomic distributed object storage cluster
@@ -194,13 +197,57 @@ developed as part of the Ceph distributed storage system. This is a
 shared library allowing applications to access the distributed object
 store using a simple file-like interface.

+%package -n librados2-devel
+Summary:	RADOS headers
+Group:		Development/Libraries
+License:	LGPL-2.0
+Requires:	librados2 = %{epoch}:%{version}-%{release}
+Obsoletes:	ceph-devel < %{epoch}:%{version}-%{release}
+%description -n librados2-devel
+This package contains libraries and headers needed to develop programs
+that use RADOS object store.
+
+%package -n python-rados
+Summary:	Python libraries for the RADOS object store
+Group:		System Environment/Libraries
+License:	LGPL-2.0
+Requires:	librados2 = %{epoch}:%{version}-%{release}
+Obsoletes:	python-ceph < %{epoch}:%{version}-%{release}
+%if 0%{defined suse_version}
+%py_requires
+%endif
+%description -n python-rados
+This package contains Python libraries for interacting with Cephs RADOS
+object store.
+
+%package -n libradosstriper1
+Summary:	RADOS striping interface
+Group:		System Environment/Libraries
+License:	LGPL-2.0
+Requires:	librados2 = %{epoch}:%{version}-%{release}
+%description -n libradosstriper1
+Striping interface built on top of the rados library, allowing
+to stripe bigger objects onto several standard rados objects using
+an interface very similar to the rados one.
+
+%package -n libradosstriper1-devel
+Summary:	RADOS striping interface headers
+Group:		Development/Libraries
+License:	LGPL-2.0
+Requires:	libradosstriper1 = %{epoch}:%{version}-%{release}
+Requires:	librados2-devel = %{epoch}:%{version}-%{release}
+Obsoletes:	ceph-devel < %{epoch}:%{version}-%{release}
+%description -n libradosstriper1-devel
+This package contains libraries and headers needed to develop programs
+that use RADOS striping interface.
+
 %package -n librbd1
 Summary:	RADOS block device client library
 Group:		System Environment/Libraries
 License:	LGPL-2.0
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 %if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
-Obsoletes:	ceph-libs < 1:0.80.5
+Obsoletes:	ceph-libs < %{epoch}:%{version}-%{release}
 %endif
 %description -n librbd1
 RBD is a block device striped across multiple distributed objects in
@@ -208,13 +255,35 @@ RADOS, a reliable, autonomic distributed object storage cluster
 developed as part of the Ceph distributed storage system. This is a
 shared library allowing applications to manage these block devices.

+%package -n librbd1-devel
+Summary:	RADOS block device headers
+Group:		Development/Libraries
+License:	LGPL-2.0
+Requires:	librbd1 = %{epoch}:%{version}-%{release}
+Requires:	librados2-devel = %{epoch}:%{version}-%{release}
+Obsoletes:	ceph-devel < %{epoch}:%{version}-%{release}
+%description -n librbd1-devel
+This package contains libraries and headers needed to develop programs
+that use RADOS block device.
+
+%package -n python-rbd
+Summary:	Python libraries for the RADOS block device
+Group:		System Environment/Libraries
+License:	LGPL-2.0
+Requires:	librbd1 = %{epoch}:%{version}-%{release}
+Requires:	python-rados = %{epoch}:%{version}-%{release}
+Obsoletes:	python-ceph < %{epoch}:%{version}-%{release}
+%description -n python-rbd
+This package contains Python libraries for interacting with Cephs RADOS
+block device.
+
 %package -n libcephfs1
 Summary:	Ceph distributed file system client library
 Group:		System Environment/Libraries
 License:	LGPL-2.0
 %if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
-Obsoletes:	ceph-libs < 1:0.80.5
-Obsoletes:	ceph-libcephfs < 1:0.80.5
+Obsoletes:	ceph-libs < %{epoch}:%{version}-%{release}
+Obsoletes:	ceph-libcephfs < %{epoch}:%{version}-%{release}
 %endif
 %description -n libcephfs1
 Ceph is a distributed network file system designed to provide excellent
@@ -222,19 +291,27 @@ performance, reliability, and scalability. This is a shared library
 allowing applications to access a Ceph distributed file system via a
 POSIX-like interface.

-%package -n python-ceph
-Summary:	Python libraries for the Ceph distributed filesystem
+%package -n libcephfs1-devel
+Summary:	Ceph distributed file system headers
+Group:		Development/Libraries
+License:	LGPL-2.0
+Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
+Requires:	librados2-devel = %{epoch}:%{version}-%{release}
+Obsoletes:	ceph-devel < %{epoch}:%{version}-%{release}
+%description -n libcephfs1-devel
+This package contains libraries and headers needed to develop programs
+that use Cephs distributed file system.
+
+%package -n python-cephfs
+Summary:	Python libraries for Ceph distributed file system
 Group:		System Environment/Libraries
 License:	LGPL-2.0
-Requires:	librados2 = %{epoch}:%{version}-%{release}
-Requires:	librbd1 = %{epoch}:%{version}-%{release}
-Requires:	python-flask
-%if 0%{defined suse_version}
-%py_requires
-%endif
-%description -n python-ceph
-This package contains Python libraries for interacting with Cephs RADOS
-object storage.
+Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
+Requires:	python-rados = %{epoch}:%{version}-%{release}
+Obsoletes:	python-ceph < %{epoch}:%{version}-%{release}
+%description -n python-cephfs
+This package contains Python libraries for interacting with Cephs distributed
+file system.

 %package -n rest-bench
 Summary:	RESTful benchmark
@@ -248,9 +325,7 @@ RESTful bencher that can be used to benchmark radosgw performance.
 Summary:	Ceph benchmarks and test tools
 Group:		System Environment/Libraries
 License:	LGPL-2.0
-Requires:	librados2 = %{epoch}:%{version}-%{release}
-Requires:	librbd1 = %{epoch}:%{version}-%{release}
-Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
+Requires:	ceph-common = %{epoch}:%{version}-%{release}
 %description -n ceph-test
 This package contains Ceph benchmarks and test tools.

@@ -265,6 +340,17 @@ BuildRequires:	java-devel
 This package contains the Java Native Interface library for CephFS Java
 bindings.

+%package -n libcephfs_jni1-devel
+Summary:	Development files for CephFS Java Native Interface library.
+Group:		System Environment/Libraries
+License:	LGPL-2.0
+Requires:	java
+Requires:	libcephfs_jni1 = %{epoch}:%{version}-%{release}
+Obsoletes:	ceph-devel < %{epoch}:%{version}-%{release}
+%description -n libcephfs_jni1-devel
+This package contains the development files for CephFS Java Native Interface
+library.
+
 %package -n cephfs-java
 Summary:	Java libraries for the Ceph File System.
 Group:		System Environment/Libraries
@@ -272,6 +358,13 @@ License:	LGPL-2.0
 Requires:	java
 Requires:	libcephfs_jni1 = %{epoch}:%{version}-%{release}
 BuildRequires:	java-devel
+%if 0%{?el6}
+Requires:	junit4
+BuildRequires:	junit4
+%else
+Requires:       junit
+BuildRequires:  junit
+%endif
 %description -n cephfs-java
 This package contains the Java libraries for the Ceph File System.

@@ -279,7 +372,7 @@ This package contains the Java libraries for the Ceph File System.
 Summary:	Meta package to include ceph libraries.
 Group:		System Environment/Libraries
 License:	LGPL-2.0
-Obsoletes:	ceph-libs < 1:0.80.5
+Obsoletes:	ceph-libs
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
@@ -292,6 +385,39 @@ former ceph-libs package, which is now split up into these three subpackages.
 Packages still depending on ceph-libs should be fixed to depend on librados2,
 librbd1 or libcephfs1 instead.

+%package devel-compat
+Summary:	Compatibility package for Ceph headers
+Group:		Development/Libraries
+License:	LGPL-2.0
+Obsoletes:	ceph-devel
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	librados2-devel = %{epoch}:%{version}-%{release}
+Requires:	libradosstriper1-devel = %{epoch}:%{version}-%{release}
+Requires:	librbd1-devel = %{epoch}:%{version}-%{release}
+Requires:	libcephfs1-devel = %{epoch}:%{version}-%{release}
+Requires:	libcephfs_jni1-devel = %{epoch}:%{version}-%{release}
+Provides:	ceph-devel
+%description devel-compat
+This is a compatibility package to accommodate ceph-devel split into
+librados2-devel, librbd1-devel and libcephfs1-devel. Packages still depending
+on ceph-devel should be fixed to depend on librados2-devel, librbd1-devel,
+libcephfs1-devel or libradosstriper1-devel instead.
+
+%package -n python-ceph-compat
+Summary:	Compatibility package for Cephs python libraries
+Group:		System Environment/Libraries
+License:	LGPL-2.0
+Obsoletes:	python-ceph
+Requires:	python-rados = %{epoch}:%{version}-%{release}
+Requires:	python-rbd = %{epoch}:%{version}-%{release}
+Requires:	python-cephfs = %{epoch}:%{version}-%{release}
+Provides:	python-ceph
+%description -n python-ceph-compat
+This is a compatibility package to accommodate python-ceph split into
+python-rados, python-rbd and python-cephfs. Packages still depending on
+python-ceph should be fixed to depend on python-rados, python-rbd or
+python-cephfs instead.
+
 %if 0%{?opensuse} || 0%{?suse_version}
 %debug_package
 %endif
@@ -301,8 +427,13 @@ librbd1 or libcephfs1 instead.
 #################################################################################
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
+%endif

 %build
 # Find jni.h
@@ -311,26 +442,12 @@ for i in /usr/{lib64,lib}/jvm/java/include{,/linux}; do
 done

 ./autogen.sh
-
-%if ( 0%{?rhel} && 0%{?rhel} <= 6)
-MY_CONF_OPT="--without-libxfs"
-%else
 MY_CONF_OPT=""
-%endif

 MY_CONF_OPT="$MY_CONF_OPT --with-radosgw"

-# No gperftools on these architectures
-%ifarch ppc ppc64 s390 s390x
-MY_CONF_OPT="$MY_CONF_OPT --without-tcmalloc"
-%endif
-
 export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`

-%ifarch armv5tel
-# libatomic_ops does not have correct asm for ARMv5tel
-EXTRA_CFLAGS="-DAO_USE_PTHREAD_DEFS"
-%endif
 %ifarch %{arm}
 # libatomic_ops seems to fallback on some pthread implementation on ARM
 EXTRA_LDFLAGS="-lpthread"
@@ -346,6 +463,10 @@ EXTRA_LDFLAGS="-lpthread"
 		--with-rest-bench \
 		--with-debug \
 		--enable-cephfs-java \
+		--with-librocksdb-static=check \
+%ifarch s390 s390x
+		--without-tcmalloc \
+%endif
 		$MY_CONF_OPT \
 		%{?_with_ocf} \
 		CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \
@@ -367,8 +488,11 @@ make %{_smp_mflags}
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
+# Do not package man page for binary that is not shipped
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/rbd-replay-prep.8*
+# Install init scripts and other files
 install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
-install -D src/init-radosgw.sysv $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
+install -D src/init-radosgw $RPM_BUILD_ROOT%{_initrddir}/ceph-radosgw
 install -D src/init-rbdmap $RPM_BUILD_ROOT%{_initrddir}/rbdmap
 install -D src/rbdmap $RPM_BUILD_ROOT%{_sysconfdir}/ceph/rbdmap
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -396,7 +520,6 @@ install -m 0644 -D udev/95-ceph-osd.rules $RPM_BUILD_ROOT/lib/udev/rules.d/95-ce

 %if 0%{?rhel} >= 7 || 0%{?fedora}
 mv $RPM_BUILD_ROOT/lib/udev/rules.d/95-ceph-osd.rules $RPM_BUILD_ROOT/usr/lib/udev/rules.d/95-ceph-osd.rules
-mv $RPM_BUILD_ROOT/sbin/mkcephfs $RPM_BUILD_ROOT/usr/sbin/mkcephfs
 mv $RPM_BUILD_ROOT/sbin/mount.ceph $RPM_BUILD_ROOT/usr/sbin/mount.ceph
 mv $RPM_BUILD_ROOT/sbin/mount.fuse.ceph $RPM_BUILD_ROOT/usr/sbin/mount.fuse.ceph
 %endif
@@ -455,6 +578,7 @@ fi
 %{_bindir}/cephfs
 %{_bindir}/ceph-clsinfo
 %{_bindir}/ceph-rest-api
+%{python_sitelib}/ceph_rest_api.py*
 %{_bindir}/crushtool
 %{_bindir}/monmaptool
 %{_bindir}/osdmaptool
@@ -462,12 +586,12 @@ fi
 %{_bindir}/ceph-mon
 %{_bindir}/ceph-mds
 %{_bindir}/ceph-osd
-%{_bindir}/ceph-rbdnamer
 %{_bindir}/librados-config
 %{_bindir}/ceph-client-debug
+%{_bindir}/cephfs-journal-tool
+%{_bindir}/cephfs-table-tool
 %{_bindir}/ceph-debugpack
 %{_bindir}/ceph-coverage
-%{_bindir}/ceph_mon_store_converter
 %{_initrddir}/ceph
 %{_sbindir}/ceph-disk
 %{_sbindir}/ceph-disk-activate
@@ -476,14 +600,13 @@ fi
 %{_sbindir}/ceph-create-keys
 %{_sbindir}/rcceph
 %if 0%{?rhel} >= 7 || 0%{?fedora}
-%{_sbindir}/mkcephfs
 %{_sbindir}/mount.ceph
 %else
-/sbin/mkcephfs
 /sbin/mount.ceph
 %endif
 %dir %{_libdir}/ceph
 %{_libdir}/ceph/ceph_common.sh
+%{_libexecdir}/ceph/ceph-osd-prestart.sh
 %dir %{_libdir}/rados-classes
 %{_libdir}/rados-classes/libcls_rbd.so*
 %{_libdir}/rados-classes/libcls_hello.so*
@@ -497,13 +620,7 @@ fi
 %{_libdir}/rados-classes/libcls_user.so*
 %{_libdir}/rados-classes/libcls_version.so*
 %dir %{_libdir}/ceph/erasure-code
-%{_libdir}/ceph/erasure-code/libec_example.so*
-%{_libdir}/ceph/erasure-code/libec_fail_to_initialize.so*
-%{_libdir}/ceph/erasure-code/libec_fail_to_register.so*
-%{_libdir}/ceph/erasure-code/libec_hangs.so*
-%{_libdir}/ceph/erasure-code/libec_jerasure*.so*
-%{_libdir}/ceph/erasure-code/libec_test_jerasure*.so*
-%{_libdir}/ceph/erasure-code/libec_missing_entry_point.so*
+%{_libdir}/ceph/erasure-code/libec_*.so*
 %if 0%{?rhel} >= 7 || 0%{?fedora}
 /usr/lib/udev/rules.d/60-ceph-partuuid-workaround.rules
 /usr/lib/udev/rules.d/95-ceph-osd.rules
@@ -513,11 +630,12 @@ fi
 %endif
 %config %{_sysconfdir}/bash_completion.d/ceph
 %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
-%config(noreplace) %{_sysconfdir}/logrotate.d/radosgw
+%{_mandir}/man8/ceph-deploy.8*
+%{_mandir}/man8/ceph-disk.8*
+%{_mandir}/man8/ceph-create-keys.8*
 %{_mandir}/man8/ceph-mon.8*
 %{_mandir}/man8/ceph-mds.8*
 %{_mandir}/man8/ceph-osd.8*
-%{_mandir}/man8/mkcephfs.8*
 %{_mandir}/man8/ceph-run.8*
 %{_mandir}/man8/ceph-rest-api.8*
 %{_mandir}/man8/crushtool.8*
@@ -525,10 +643,9 @@ fi
 %{_mandir}/man8/monmaptool.8*
 %{_mandir}/man8/cephfs.8*
 %{_mandir}/man8/mount.ceph.8*
-%{_mandir}/man8/ceph-rbdnamer.8*
 %{_mandir}/man8/ceph-debugpack.8*
-%{_mandir}/man8/ceph-clsinfo.8.gz
-%{_mandir}/man8/librados-config.8.gz
+%{_mandir}/man8/ceph-clsinfo.8*
+%{_mandir}/man8/librados-config.8*
 #set up placeholder directories
 %dir %{_localstatedir}/lib/ceph/
 %dir %{_localstatedir}/lib/ceph/tmp
@@ -546,6 +663,7 @@ fi
 %{_bindir}/ceph-authtool
 %{_bindir}/ceph-conf
 %{_bindir}/ceph-dencoder
+%{_bindir}/ceph-rbdnamer
 %{_bindir}/ceph-syn
 %{_bindir}/ceph-crush-location
 %{_bindir}/rados
@@ -555,6 +673,7 @@ fi
 %{_mandir}/man8/ceph-authtool.8*
 %{_mandir}/man8/ceph-conf.8*
 %{_mandir}/man8/ceph-dencoder.8*
+%{_mandir}/man8/ceph-rbdnamer.8*
 %{_mandir}/man8/ceph-syn.8*
 %{_mandir}/man8/ceph-post-file.8*
 %{_mandir}/man8/ceph.8*
@@ -569,12 +688,17 @@ fi
 %config %{_sysconfdir}/bash_completion.d/rbd
 %config(noreplace) %{_sysconfdir}/ceph/rbdmap
 %{_initrddir}/rbdmap
+%{python_sitelib}/ceph_argparse.py*
+%if 0%{?rhel} >= 7 || 0%{?fedora}
+/usr/lib/udev/rules.d/50-rbd.rules
+%else
+/lib/udev/rules.d/50-rbd.rules
+%endif

 %postun -n ceph-common
 # Package removal cleanup
 if [ "$1" -eq "0" ] ; then
    rm -rf /var/log/ceph
-    rm -rf /etc/ceph
 fi

 #################################################################################
@@ -594,29 +718,6 @@ fi
 %{_bindir}/rbd-fuse
 %{_mandir}/man8/rbd-fuse.8*

-#################################################################################
-%files devel
-%defattr(-,root,root,-)
-%dir %{_includedir}/cephfs
-%{_includedir}/cephfs/libcephfs.h
-%dir %{_includedir}/rados
-%{_includedir}/rados/librados.h
-%{_includedir}/rados/librados.hpp
-%{_includedir}/rados/buffer.h
-%{_includedir}/rados/page.h
-%{_includedir}/rados/crc32c.h
-%{_includedir}/rados/rados_types.h
-%{_includedir}/rados/rados_types.hpp
-%{_includedir}/rados/memory.h
-%dir %{_includedir}/rbd
-%{_includedir}/rbd/librbd.h
-%{_includedir}/rbd/librbd.hpp
-%{_includedir}/rbd/features.h
-%{_libdir}/libcephfs.so
-%{_libdir}/librbd.so
-%{_libdir}/librados.so
-%{_libdir}/libcephfs_jni.so
-
 #################################################################################
 %files radosgw
 %defattr(-,root,root,-)
@@ -626,6 +727,7 @@ fi
 %{_mandir}/man8/radosgw.8*
 %{_mandir}/man8/radosgw-admin.8*
 %{_sbindir}/rcceph-radosgw
+%config(noreplace) %{_sysconfdir}/logrotate.d/radosgw
 %config %{_sysconfdir}/bash_completion.d/radosgw-admin
 %dir %{_localstatedir}/log/radosgw/

@@ -673,24 +775,76 @@ fi
 %postun -n librados2
 /sbin/ldconfig

+#################################################################################
+%files -n librados2-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/rados
+%{_includedir}/rados/librados.h
+%{_includedir}/rados/librados.hpp
+%{_includedir}/rados/buffer.h
+%{_includedir}/rados/page.h
+%{_includedir}/rados/crc32c.h
+%{_includedir}/rados/rados_types.h
+%{_includedir}/rados/rados_types.hpp
+%{_includedir}/rados/memory.h
+%{_libdir}/librados.so
+
+#################################################################################
+%files -n python-rados
+%defattr(-,root,root,-)
+%{python_sitelib}/rados.py*
+
+#################################################################################
+%files -n libradosstriper1
+%defattr(-,root,root,-)
+%{_libdir}/libradosstriper.so.*
+
+%post -n libradosstriper1
+/sbin/ldconfig
+
+%postun -n libradosstriper1
+/sbin/ldconfig
+
+#################################################################################
+%files -n libradosstriper1-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/radosstriper
+%{_includedir}/radosstriper/libradosstriper.h
+%{_includedir}/radosstriper/libradosstriper.hpp
+%{_libdir}/libradosstriper.so
+
 #################################################################################
 %files -n librbd1
 %defattr(-,root,root,-)
 %{_libdir}/librbd.so.*
-%if 0%{?rhel} >= 7 || 0%{?fedora}
-/usr/lib/udev/rules.d/50-rbd.rules
-%else
-/lib/udev/rules.d/50-rbd.rules
-%endif

 %post -n librbd1
 /sbin/ldconfig
+# If x86_64 and rhel6+, link the library to /usr/lib64/qemu -- rhel hack
+%ifarch x86_64
+%if 0%{?rhel} >= 6
 mkdir -p /usr/lib64/qemu/
 ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
+%endif
+%endif

 %postun -n librbd1
 /sbin/ldconfig

+#################################################################################
+%files -n librbd1-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/rbd
+%{_includedir}/rbd/librbd.h
+%{_includedir}/rbd/librbd.hpp
+%{_includedir}/rbd/features.h
+%{_libdir}/librbd.so
+
+#################################################################################
+%files -n python-rbd
+%defattr(-,root,root,-)
+%{python_sitelib}/rbd.py*
+
 #################################################################################
 %files -n libcephfs1
 %defattr(-,root,root,-)
@@ -703,13 +857,16 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 /sbin/ldconfig

 #################################################################################
-%files -n python-ceph
+%files -n libcephfs1-devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/cephfs
+%{_includedir}/cephfs/libcephfs.h
+%{_libdir}/libcephfs.so
+
+#################################################################################
+%files -n python-cephfs
 %defattr(-,root,root,-)
-%{python_sitelib}/rados.py*
-%{python_sitelib}/rbd.py*
 %{python_sitelib}/cephfs.py*
-%{python_sitelib}/ceph_argparse.py*
-%{python_sitelib}/ceph_rest_api.py*

 #################################################################################
 %files -n rest-bench
@@ -720,7 +877,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %files -n ceph-test
 %defattr(-,root,root,-)
 %{_bindir}/ceph_bench_log
-%{_bindir}/ceph_dupstore
 %{_bindir}/ceph_kvstorebench
 %{_bindir}/ceph_multi_stress_watch
 %{_bindir}/ceph_erasure_code
@@ -736,8 +892,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %{_bindir}/ceph_smalliobenchdumb
 %{_bindir}/ceph_smalliobenchfs
 %{_bindir}/ceph_smalliobenchrbd
-%{_bindir}/ceph_filestore_dump
-%{_bindir}/ceph_filestore_tool
+%{_bindir}/ceph-objectstore-tool
 %{_bindir}/ceph_streamtest
 %{_bindir}/ceph_test_*
 %{_bindir}/ceph_tpbench
@@ -745,18 +900,153 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %{_bindir}/ceph-monstore-tool
 %{_bindir}/ceph-osdomap-tool
 %{_bindir}/ceph-kvstore-tool
+%{_mandir}/man8/rbd-replay.8*
+%{_mandir}/man8/rbd-replay-many.8*
+%{_bindir}/rbd-replay
+%{_bindir}/rbd-replay-many
+%{_bindir}/ceph_perf_objectstore

+#################################################################################
 %files -n libcephfs_jni1
 %defattr(-,root,root,-)
 %{_libdir}/libcephfs_jni.so.*

+#################################################################################
+%files -n libcephfs_jni1-devel
+%defattr(-,root,root,-)
+%{_libdir}/libcephfs_jni.so
+
+#################################################################################
 %files -n cephfs-java
 %defattr(-,root,root,-)
 %{_javadir}/libcephfs.jar

+#################################################################################
 %files libs-compat
+# We need an empty %%files list for ceph-libs-compat, to tell rpmbuild to actually
+# build this meta package.
+
+#################################################################################
+%files devel-compat
+# We need an empty %%files list for ceph-devel-compat, to tell rpmbuild to
+# actually build this meta package.
+
+#################################################################################
+%files -n python-ceph-compat
+# We need an empty %%files list for python-ceph-compat, to tell rpmbuild to
+# actually build this meta package.

 %changelog
+* Mon May 16 2016 Boris Ranto <branto@redhat.com> - 1:0.94.7-2
+- New release (1:0.94.7-2)
+- Workaround xfs.h check
+
+* Mon May 16 2016 Boris Ranto <branto@redhat.com> - 1:0.94.7-1
+- New version (1:0.94.7-1)
+- Disable erasure_codelib neon build
+- init-ceph.in: Allow custom cluster names during startup.
+- Apply 'ceph-0.94.1-tcmalloc.patch'
+- Apply 'init-ceph.in-fedora.patch'
+
+* Tue Feb 23 2016 Boris Ranto <branto@redhat.com> - 0.94.6-1
+- Rebase to version 0.94.6
+
+* Wed Dec 09 2015 Boris Ranto <branto@redhat.com> - 1:0.94.5-2
+- Allow setting custom cluster names in init script (#1269436)
+
+* Tue Oct 27 2015 Boris Ranto <branto@redhat.com> - 1:0.94.5-1
+- Rebase to latest upstream version
+
+* Tue Oct 20 2015 Boris Ranto <branto@redhat.com> - 1:0.94.4-1
+- Rebase to latest upstream version
+- The rtdsc patch got merged upstream and is already present in the release
+
+* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1:0.94.3-2
+- Rebuilt for Boost 1.59
+
+* 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
+- Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576).
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.94.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Thu Jul 23 2015 David Tardon <dtardon@redhat.com> - 1:0.94.2-2
+- rebuild for Boost 1.58
+
+* Thu Jul 16 2015 Boris Ranto <branto@redhat.com> - 1:0.94.2-1
+- Rebase to latest upstream version
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.94.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon Jun 08 2015 Dan Horák <dan[at]danny.cz> - 1:0.94.1-4
+- fix build on s390(x) - no gperftools there
+
+* Thu May 21 2015 Boris Ranto <branto@redhat.com> - 1:0.94.1-3
+- Disable lttng support (rhbz#1223319)
+
+* Mon May 18 2015 Boris Ranto <branto@redhat.com> - 1:0.94.1-2
+- Fix arm linking issue (rhbz#1222286)
+
+* Tue Apr 14 2015 Boris Ranto <branto@redhat.com> - 1:0.94.1-1
+- Rebase to latest upstream version and sync-up the spec file
+- Add arm compilation patches
+
+* Wed Apr 01 2015 Ken Dreyer <ktdreyer@ktdreyer.com> - 1:0.87.1-3
+- add version numbers to Obsoletes (RHBZ #1193182)
+
+* Wed Mar 4 2015 Boris Ranto <branto@redhat.com> - 1:0.87.1-2
+- Perform a hardened build
+- Use git-formatted patches
+- Add patch for pthreads rwlock unlock problem
+- Do not remove conf files on uninstall
+- Remove the cleanup function, it is only necessary for f20 and f21
+
+* Wed Feb 25 2015 Boris Ranto <branto@redhat.com> - 1:0.87.1-1
+- Rebase to latest upstream
+- Remove boost patch, it is in upstream tarball
+- Build with yasm, tarball contains fix for the SELinux issue
+
+* Thu Jan 29 2015 Petr Machata <pmachata@redhat.com> - 1:0.87-2
+- Rebuild for boost 1.57.0
+- Include <boost/optional/optional_io.hpp> instead of
+  <boost/optional.hpp>.  Keep the old dumping behavior in
+  osd/ECBackend.cc (ceph-0.87-boost157.patch)
+
+* Mon Nov 3 2014 Boris Ranto <branto@redhat.com> - 1:0.87-1
+- Rebase to latest major version (firefly -> giant)
+
+* Thu Oct 16 2014 Boris Ranto <branto@redhat.com - 1:0.80.7-1
+- Rebase to latest upstream version
+
+* Sat Oct 11 2014 Boris Ranto <branto@redhat.com> - 1:0.80.6-3
+- Fix a typo in librados-devel vs librados2-devel dependency
+
+* Fri Oct 10 2014 Boris Ranto <branto@redhat.com> - 1:0.80.6-2
+- Provide empty file list for python-ceph-compat and ceph-devel-compat
+
+* Fri Oct 10 2014 Boris Ranto <branto@redhat.com> - 1:0.80.6-1
+- Rebase to 0.80.6
+- Split ceph-devel and python-ceph packages
+
+* Tue Sep 9 2014 Dan Horák <dan[at]danny.cz> - 1:0.80.5-10
+- update Requires for s390(x)
+
+* Wed Sep 3 2014 Boris Ranto <branto@redhat.com> - 1:0.80.5-9
+- Symlink librd.so.1 to /usr/lib64/qemu only on rhel6+ x86_64 (1136811)
+
+* Thu Aug 21 2014 Boris Ranto <branto@redhat.com> - 1:0.80.5-8
+- Revert the previous change
+- Fix bz 1118504, second attempt (yasm appears to be the package that caused this
+- Fix bogus dates
+
+* Wed Aug 20 2014 Boris Ranto <branto@redhat.com> - 1:0.80.5-7
+- Several more merges from file to try to fix the selinux issue (1118504)
+
 * Sun Aug 17 2014 Kalev Lember <kalevlember@gmail.com> - 1:0.80.5-6
 - Obsolete ceph-libcephfs

@@ -1 +1,3 @@
-c57f6887f6097f95ad2c3b169a94f811  ceph-0.80.5.tar.bz2
+e7c35581f8d36d34f7cde16a862e54fb  ceph-0.94.5.tar.bz2
+566cdeae80ee639dcb265ac284a59b48  ceph-0.94.6.tar.gz
+a8fd1046805551e301cb835f418ade72  ceph-0.94.7.tar.gz
Author	SHA1	Message	Date
Boris Ranto	373a4fde21	New release (1:0.94.7-2) - Workaround xfs.h check	2016-05-16 20:56:12 +02:00
Boris Ranto	8c6c0bc84b	New version (1:0.94.7-1) - Disable erasure_codelib neon build - init-ceph.in: Allow custom cluster names during startup. - Apply 'ceph-0.94.1-tcmalloc.patch' - Apply 'init-ceph.in-fedora.patch'	2016-05-16 15:49:01 +02:00
Boris Ranto	c124767d87	Rebase to version 0.94.6	2016-02-23 18:10:02 +01:00
Boris Ranto	d2c3e8a99e	Allow setting custom cluster names in init script Also, remove unused patch file. Resolves: rhbz#1269436	2015-12-09 13:52:04 +01:00
Boris Ranto	58a926ad22	Rebase to latest upstream version (0.94.5)	2015-10-27 16:05:32 +01:00
Boris Ranto	a127e04b4b	Post-rebase fix-up The init-radosgw.sysv file was renamed to init-radosgw file in 0.94.4.	2015-10-20 14:49:23 +02:00
Boris Ranto	4ded3cb8c5	Rebase to latest upstream version (0.94.4) The rtdsc patch got merged upstream and is already present in the release	2015-10-20 12:22:29 +02:00
Jonathan Wakely	94662be077	Rebuilt for Boost 1.59	2015-10-20 12:22:21 +02:00
Boris Ranto	aa5aa9c8cf	Fix file list after rebase Resolves: rhbz#1257374	2015-08-28 09:44:00 +02:00
Boris Ranto	6f8a9b9b1f	Rebase to latest upstream version (0.94.3) Resolves: rhbz#1257374	2015-08-28 09:43:55 +02:00
Richard W.M. Jones	822933e3ed	Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576 ).	2015-08-05 22:34:59 -05:00
Dennis Gilmore	dd200ec89a	- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159	2015-07-29 12:04:24 -05:00
David Tardon	8b22c27cbd	rebuild for Boost 1.58	2015-07-23 09:28:47 +02:00
Boris Ranto	989a021ac8	Rebase to latest upstream version (0.94.2) Resolves: rhbz#1229924	2015-07-16 13:56:25 +02:00
Dennis Gilmore	9b5287b8d1	- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild	2015-06-17 02:30:12 +00:00
Dan Horák	94d715c6db	- fix build on s390(x) - no gperftools there	2015-06-08 17:43:13 +02:00
Boris Ranto	c767eafe44	Disable lttng support Resolves: rhbz#1223319	2015-05-21 11:03:50 +02:00
Boris Ranto	300509739c	Fix arm linking issue Resolves: rhbz#1222286	2015-05-18 20:34:11 +02:00
Boris Ranto	bedf031a7d	Fix arm compilation issues	2015-04-16 13:10:30 +02:00
Boris Ranto	2a379f1396	Rebase to latest upstream (0.94.1) and sync-up spec file	2015-04-14 17:09:59 +02:00
Ken Dreyer	a6871cb0d5	add version numbers to Obsoletes The ceph-devel and python-ceph packages were split out, but there were no version numbers added to the Obsoletes during the split. This means that we obsolete packages that are far newer than us. This impacts packages coming from upstream's "gitbuilder" system (for example), as well as any other upstream RPMs until this package split is done upstream. Add version numbers to the Obsoletes. I've chosen to use a version+release number that's lower than what we currently ship in Fedora (0.87-1), but newer than what we shipped in the last Fedora update (0.80.6-1).	2015-04-01 09:04:15 -06:00
Boris Ranto	2a0aaf952c	Fix several issues with spec file - Perform a hardened build - Use git-formatted patches - Add patch for pthreads rwlock unlock problem - Do not remove conf files on uninstall - Remove the cleanup function, it is only necessary for f20 and f21	2015-03-04 16:13:36 +01:00
Boris Ranto	84aa853323	Rebase to 0.87.1	2015-02-25 11:33:57 +01:00
Ken Dreyer	37b2dd4d84	add upstream ticket link for Boost 1.57.0 patch The Boost 1.57.0 patch has been sent upstream. Record a link to this ticket in the comments of our spec file.	2015-01-29 09:30:47 -07:00
Petr Machata	c130ff2a04	Include <boost/optional/optional_io.hpp> instead of <boost/optional.hpp> Keep the old behavior in one case, where a std::map is printed, and the corresponding operator<< isn't available.	2015-01-29 03:18:49 +01:00
Petr Machata	c485e3a1fb	Rebuild for boost 1.57.0	2015-01-27 03:29:25 +01:00
Boris Ranto	d8048b573b	Sync-up with upstream -- formatting issues	2014-11-12 14:59:35 +01:00
Boris Ranto	7ebc469b21	Fix the removed path (missing RPM_BUILD_ROOT)	2014-11-03 17:38:23 +01:00
Boris Ranto	3b0b0e04e8	Rebase to latest major version (firefly -> giant)	2014-11-03 16:31:09 +01:00
Boris Ranto	290a036741	Rebase to latest upstream version	2014-10-16 12:38:49 +02:00
Boris Ranto	a4d87e63c6	Fix the librados-devel vs librados2-devel problem	2014-10-11 15:58:58 +02:00
Boris Ranto	628a5cfe1f	Provide empty file list for python-ceph-compat and ceph-devel-compat	2014-10-10 16:42:20 +02:00
Boris Ranto	7da3554afd	Rebase and split ceph-devel, python-ceph packages	2014-10-10 15:44:05 +02:00
Dan Horák	34495d4d5f	- update Requires for s390(x)	2014-09-09 10:12:07 +02:00
Boris Ranto	273aebea8d	Fix bz 1136811 (incorrect symlink on fedora)	2014-09-03 15:30:38 +02:00
Boris Ranto	ac3de9eccb	Fix bogus dates	2014-08-22 01:56:50 +02:00
Boris Ranto	e46d0f152b	Second attempt to fix selinux issue (bz 1118504)	2014-08-22 01:53:25 +02:00
Boris Ranto	b3185457ec	Revert "Modify configure flags to get rid of selinux-related permission denied when loading libraries (bz 1118504)" This reverts commit `7f6844291d`. The reason is that the commit did not fix the issue.	2014-08-22 01:14:20 +02:00
Boris Ranto	7f6844291d	Modify configure flags to get rid of selinux-related permission denied when loading libraries (bz 1118504)	2014-08-21 17:42:17 +02:00