From fa260b6c30f6b0e0fa1fe98712eca806febb0c35 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 4 Apr 2014 15:33:09 +0200
Subject: [PATCH] - updated to 0.78 - updated logrotate patch - BR:
 xfsprogs-devel (for XFS ioctl consts)

---
 ceph.logrotate.patch | 24 ++++++++++++++----------
 ceph.spec            |  6 ++++--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 6bddd00..2a3bb24 100644
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,6 +1,6 @@
---- ceph-0.58/src/logrotate.conf.orig	2013-03-08 22:30:48.205300063 +0100
-+++ ceph-0.58/src/logrotate.conf	2013-03-08 22:31:18.038632150 +0100
-@@ -4,21 +4,7 @@
+--- 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
+@@ -4,25 +4,7 @@
      compress
      sharedscripts
      postrotate
@@ -11,13 +11,17 @@
 -        fi
 -        # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
 -        if which initctl > /dev/null 2>&1 && [ -x `which initctl` ]; then
--            # upstart reload isn't very helpful here:
--            #   https://bugs.launchpad.net/upstart/+bug/1012938
--	    initctl list \
--		| sed -n 's/^\(ceph-\(mon\|osd\|mds\)\+\)[ \t]\+(\([^ \/]\+\)\/\([^ \/]\+\))[ \t]\+start\/.*$/\1 cluster=\3 id=\4/p' \
--		| while read l; do
--		initctl reload -- $l 2>/dev/null || :
--	    done
+-            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
+-                      cluster="${f%%-*}"
+-                      id="${f#*-}"
+-
+-                      initctl reload ceph-$daemon cluster="$cluster" id="$id" 2>/dev/null || :
+-                    fi
+-                  done
+-            done
 -        fi
 +        service ceph reload >/dev/null 2>/dev/null
      endscript
diff --git a/ceph.spec b/ceph.spec
index cfd15ac..749dbaa 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -6,12 +6,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.77
+Version:	0.78
 Release:	1
 License:	LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:		Base
 Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	8a6f841e5ed6d8d993849f7dc00c8a7b
+# Source0-md5:	63a26228dc38a5e2d9ecf5ecfc4c9cfb
 Patch0:		%{name}-init-fix.patch
 Patch1:		%{name}.logrotate.patch
 URL:		http://ceph.com/
@@ -43,6 +43,7 @@ BuildRequires:	pkgconfig
 BuildRequires:	python >= 1:2.4
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	snappy-devel
+BuildRequires:	xfsprogs-devel
 %ifarch %{x8664}
 BuildRequires:	yasm
 %endif
@@ -252,6 +253,7 @@ fi
 %dir %{_sysconfdir}/ceph
 %attr(755,root,root) %{_bindir}/ceph
 %attr(755,root,root) %{_bindir}/ceph-authtool
+%attr(755,root,root) %{_bindir}/ceph-brag
 %attr(755,root,root) %{_bindir}/ceph-clsinfo
 %attr(755,root,root) %{_bindir}/ceph-conf
 %attr(755,root,root) %{_bindir}/ceph-coverage
-- 
2.43.0