From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 23 Aug 2014 05:39:30 +0000 (+0200)
Subject: - updated to 0.84
X-Git-Tag: auto/th/ceph-0.84-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fceph.git;a=commitdiff_plain;h=548e0d3

- updated to 0.84
- updated logrotate patch
---

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 2a3bb24..74bbca9 100644
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,5 +1,5 @@
---- ceph-0.78/src/logrotate.conf.orig	2014-04-03 18:19:47.067725657 +0200
-+++ ceph-0.78/src/logrotate.conf	2014-04-03 18:26:09.521051018 +0200
+--- ceph-0.84/src/logrotate.conf.orig	2014-08-22 19:12:40.945575009 +0200
++++ ceph-0.84/src/logrotate.conf	2014-08-22 19:14:59.222235873 +0200
 @@ -4,25 +4,7 @@
      compress
      sharedscripts
@@ -14,7 +14,7 @@
 -            for daemon in osd mon mds ; do
 -              find -L /var/lib/ceph/$daemon/ -mindepth 1 -maxdepth 1 -regextype posix-egrep -regex '.*/[A-Za-z0-9]+-[A-Za-z0-9._-]+' -printf '%P\n' \
 -                | while read f; do
--                    if [ -e "/var/lib/ceph/$daemon/$f/done" ] && [ -e "/var/lib/ceph/$daemon/$f/upstart" ] && [ ! -e "/var/lib/ceph/$daemon/$f/sysvinit" ]; then
+-                    if [ -e "/var/lib/ceph/$daemon/$f/done" -o -e "/var/lib/ceph/$daemon/$f/ready" ] && [ -e "/var/lib/ceph/$daemon/$f/upstart" ] && [ ! -e "/var/lib/ceph/$daemon/$f/sysvinit" ]; then
 -                      cluster="${f%%-*}"
 -                      id="${f#*-}"
 -
@@ -26,4 +26,4 @@
 +        service ceph reload >/dev/null 2>/dev/null
      endscript
      missingok
- }
+     notifempty
diff --git a/ceph.spec b/ceph.spec
index 8d14570..f4f723b 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,3 +1,4 @@
+# TODO: --with-kinetic?
 #
 # Conditional build:
 %bcond_without	java	# Java binding
@@ -6,12 +7,12 @@
 Summary:	User space components of the Ceph file system
 Summary(pl.UTF-8):	Działające w przestrzeni użytkownika elementy systemu plików Ceph
 Name:		ceph
-Version:	0.82
-Release:	2
+Version:	0.84
+Release:	1
 License:	LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:		Base
 Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	26cc762f36786ab601705a9d3a30e16e
+# Source0-md5:	c7d8c8483cf1cef4dfb529500ed7ea93
 Patch0:		%{name}-init-fix.patch
 Patch1:		%{name}.logrotate.patch
 URL:		http://ceph.com/
@@ -27,10 +28,10 @@ BuildRequires:	gdbm-devel
 BuildRequires:	jdk
 %endif
 BuildRequires:	keyutils-devel
-BuildRequires:	leveldb-devel
+BuildRequires:	leveldb-devel >= 1.2
 BuildRequires:	libaio-devel
 BuildRequires:	libatomic_ops
-BuildRequires:	libblkid-devel
+BuildRequires:	libblkid-devel >= 2.17
 BuildRequires:	libedit-devel >= 2.11
 BuildRequires:	libfuse-devel
 BuildRequires:	libltdl-devel
@@ -44,6 +45,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	python >= 1:2.4
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	snappy-devel
+BuildRequires:	udev-devel
 BuildRequires:	xfsprogs-devel
 %ifarch %{x8664}
 BuildRequires:	yasm
@@ -290,6 +292,7 @@ fi
 %attr(755,root,root) /sbin/mount.ceph
 %attr(755,root,root) /sbin/mount.fuse.ceph
 %dir %{_libdir}/ceph
+%attr(755,root,root) %{_libdir}/ceph/ceph-osd-prestart.sh
 %{_libdir}/ceph/ceph_common.sh
 %dir %{_libdir}/ceph/erasure-code
 %attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_example.so*
@@ -357,6 +360,8 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libcephfs.so.1
 %attr(755,root,root) %{_libdir}/librados.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/librados.so.2
+%attr(755,root,root) %{_libdir}/libradosstriper.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libradosstriper.so.1
 %attr(755,root,root) %{_libdir}/librbd.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/librbd.so.1
 
@@ -364,18 +369,22 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcephfs.so
 %attr(755,root,root) %{_libdir}/librados.so
+%attr(755,root,root) %{_libdir}/libradosstriper.so
 %attr(755,root,root) %{_libdir}/librbd.so
 %{_libdir}/libcephfs.la
 %{_libdir}/librados.la
+%{_libdir}/libradosstriper.la
 %{_libdir}/librbd.la
 %{_includedir}/cephfs
 %{_includedir}/rados
+%{_includedir}/radosstriper
 %{_includedir}/rbd
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libcephfs.a
 %{_libdir}/librados.a
+%{_libdir}/libradosstriper.a
 %{_libdir}/librbd.a
 
 %files -n python-ceph