- updated to 0.54

- updated logrotate patch

diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 1cdb7d1bc7d12eec49d7a9e0970ac4be9a8fd305..640372dd30f2b3b1b5709d0ca5c5f8580348cba8 100644 (file)
--- 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
+ }

diff --git a/ceph.spec b/ceph.spec
index 6d3fe082e171f189d564d108dad7144bf746df82..f69b546f08efbd8300abfffeb00ac35142e392c8 100644 (file)
--- 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