[packages/ceph] - updated to 0.55.1 - updated .logrotate,link patches

[qboosh]

commit 29b2f8e94864fc92a5c6fe2e45f2040336938702
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 15 19:40:26 2012 +0100

    - updated to 0.55.1
    - updated .logrotate,link patches

 ceph-link.patch      | 14 +++++++-------
 ceph.logrotate.patch | 16 +++++++++-------
 ceph.spec            |  4 ++--
 3 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/ceph.spec b/ceph.spec
index f69b546..be7bd0f 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.54
+Version:	0.55.1
 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:	f48a6b056c4cefe74249d44474dd0c27
+# Source0-md5:	8276e98f2cffe6deabe729716fe930f6
 Patch0:		%{name}-init-fix.patch
 Patch1:		%{name}.logrotate.patch
 Patch2:		%{name}-link.patch
diff --git a/ceph-link.patch b/ceph-link.patch
index 72ae26f..203346e 100644
--- a/ceph-link.patch
+++ b/ceph-link.patch
@@ -1,6 +1,6 @@
---- ceph-0.51/src/Makefile.am.orig	2012-08-26 00:58:03.000000000 +0200
-+++ ceph-0.51/src/Makefile.am	2012-09-10 18:52:40.813987974 +0200
-@@ -53,7 +53,7 @@
+--- ceph-0.55.1/src/Makefile.am.orig	2012-12-13 01:22:18.000000000 +0100
++++ ceph-0.55.1/src/Makefile.am	2012-12-15 15:24:44.676015542 +0100
+@@ -54,7 +54,7 @@
  EXTRALIBS += -lprofiler
  endif
  
@@ -9,7 +9,7 @@
  
  LIBOS_LDA = libos.a
  
-@@ -137,7 +137,7 @@
+@@ -139,7 +139,7 @@
  bin_PROGRAMS += cephfs
  
  librados_config_SOURCES = librados-config.cc
@@ -18,16 +18,16 @@
  bin_PROGRAMS += librados-config
  
  # synthetic client
-@@ -268,7 +268,7 @@
+@@ -295,7 +295,7 @@
  libcephfs_la_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
  libcephfs_la_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
- libcephfs_la_LIBADD = libosdc.la
+ libcephfs_la_LIBADD = libclient.la
 -libcephfs_la_LDFLAGS =  $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) \
 +libcephfs_la_LDFLAGS =  $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS) -lboost_system \
              ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '^ceph_.*'
  lib_LTLIBRARIES += libcephfs.la
  
-@@ -293,7 +293,7 @@
+@@ -317,7 +317,7 @@
  librados_la_SOURCES = ${librados_SOURCES}
  librados_la_CFLAGS = ${CRYPTO_CFLAGS} ${AM_CFLAGS}
  librados_la_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 640372d..fd84975 100644
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,14 +1,16 @@
---- 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 @@
+--- ceph-0.55.1/src/logrotate.conf.orig	2012-12-15 15:11:13.516032449 +0100
++++ ceph-0.55.1/src/logrotate.conf	2012-12-15 15:16:52.636025383 +0100
+@@ -4,23 +4,7 @@
      compress
      sharedscripts
      postrotate
--        if [ -x `which invoke-rc.d` ]; then
+-        if which invoke-rc.d && [ -x `which invoke-rc.d` ]; then
 -            invoke-rc.d ceph reload >/dev/null
--        elif [ -x `which service` ]; then
+-        elif which service && [ -x `which service` ]; then
 -            service ceph reload >/dev/null
--        elif [ -x `which initctl` ]; then
+-        fi
+-        # Possibly reload twice, but depending on ceph.conf the reload above may be a no-op
+-        if which initctl && [ -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
@@ -19,7 +21,7 @@
 -		done
 -            done
 -        fi
-+            service ceph reload >/dev/null 2>/dev/null
++        service ceph reload >/dev/null 2>/dev/null
      endscript
      missingok
  }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ceph.git/commitdiff/29b2f8e94864fc92a5c6fe2e45f2040336938702