[packages/ceph] - updated to 0.54 - updated logrotate patch

[qboosh]

commit 96a54cb4aee07f6bb6dc17352c831a21cf49521d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Nov 16 16:39:24 2012 +0100

    - updated to 0.54
    - updated logrotate patch

 ceph.logrotate.patch | 30 ++++++++++++++++++++++--------
 ceph.spec            |  8 ++++----
 2 files changed, 26 insertions(+), 12 deletions(-)
---
diff --git a/ceph.spec b/ceph.spec
index 6d3fe08..f69b546 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -5,12 +5,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.53
-Release:	2
+Version:	0.54
+Release:	1
 License:	LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:		Base
 Source0:	http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	504f4f9ba6f84178478b08da7bc9eb39
+# Source0-md5:	f48a6b056c4cefe74249d44474dd0c27
 Patch0:		%{name}-init-fix.patch
 Patch1:		%{name}.logrotate.patch
 Patch2:		%{name}-link.patch
@@ -170,7 +170,7 @@ Klient Hadoopa dla systemu plików Ceph.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
 
 %build
diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 1cdb7d1..640372d 100644
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,11 +1,25 @@
---- src/logrotate.conf	2012-07-03 00:22:59.000000000 -0400
-+++ src/logrotate.conf.new	2012-09-09 12:56:09.912929358 -0400
-@@ -4,7 +4,7 @@
+--- ceph-0.54/src/logrotate.conf.orig	2012-11-15 21:05:38.519614603 +0100
++++ ceph-0.54/src/logrotate.conf	2012-11-15 21:09:14.862943424 +0100
+@@ -4,21 +4,7 @@
      compress
      sharedscripts
      postrotate
--        invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
-+        service ceph reload >/dev/null 2>/dev/null || true
- 
- 	# upstart reload isn't very helpful here:
- 	#   https://bugs.launchpad.net/upstart/+bug/1012938
+-        if [ -x `which invoke-rc.d` ]; then
+-            invoke-rc.d ceph reload >/dev/null
+-        elif [ -x `which service` ]; then
+-            service ceph reload >/dev/null
+-        elif [ -x `which initctl` ]; then
+-            # upstart reload isn't very helpful here:
+-            #   https://bugs.launchpad.net/upstart/+bug/1012938
+-            for type in mon osd mds; do
+-		initctl list \
+-		    | perl -ne 'print "$+{service} cluster=$+{cluster} id=$+{id}\n" if m{^(?<service>ceph-(mon|osd|mds)+)\s+\((?<cluster>[^/)]+)/(?<id>[^)]+)\) start/}' \
+-		    | while read l; do
+-		    initctl reload -- $l 2>/dev/null || :
+-		done
+-            done
+-        fi
++            service ceph reload >/dev/null 2>/dev/null
+     endscript
+     missingok
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ceph.git/commitdiff/96a54cb4aee07f6bb6dc17352c831a21cf49521d