From 8f23225f594d936f94729af29d2dea01d354c283 Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@redhat.com>
Date: May 09 2012 21:00:02 +0000
Subject: - update to 0.46


---

diff --git a/.gitignore b/.gitignore
index 362c339..f0c2b20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ ceph-0.20.tar.gz
 /ceph-0.43.tar.bz2
 /ceph-0.44.tar.bz2
 /ceph-0.45.tar.bz2
+/ceph-0.46.tar.bz2
diff --git a/ceph-init-fix.patch b/ceph-init-fix.patch
index 3d22e19..b4752be 100644
--- a/ceph-init-fix.patch
+++ b/ceph-init-fix.patch
@@ -1,6 +1,6 @@
-diff -up ceph-0.41/src/init-ceph.in.init ceph-0.41/src/init-ceph.in
---- ceph-0.41/src/init-ceph.in.init	2012-01-17 15:33:20.000000000 -0500
-+++ ceph-0.41/src/init-ceph.in	2012-02-16 12:48:50.887279921 -0500
+diff -up ceph-0.46/src/init-ceph.in.orig ceph-0.46/src/init-ceph.in
+--- ceph-0.46/src/init-ceph.in.orig	2012-04-24 16:06:39.000000000 -0400
++++ ceph-0.46/src/init-ceph.in	2012-05-09 16:41:36.500004052 -0400
 @@ -1,11 +1,11 @@
  #!/bin/sh
  # Start/stop ceph daemons
@@ -9,10 +9,10 @@ diff -up ceph-0.41/src/init-ceph.in.init ceph-0.41/src/init-ceph.in
  
  ### BEGIN INIT INFO
  # Provides:          ceph
--# Default-Start:     2 3 5
+-# Default-Start:     2 3 4 5
 -# Default-Stop:      0 1 6
-+# Default-Start:     
-+# Default-Stop:      
++# Default-Start:
++# Default-Stop:
  # Required-Start:    $remote_fs $named $network $time
  # Required-Stop:     $remote_fs $named $network $time
  # Short-Description: Start Ceph distributed file system daemons at boot time
diff --git a/ceph.spec b/ceph.spec
index 4d51965..2704842 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,6 +1,6 @@
 Name:          ceph
-Version:       0.45
-Release:       2%{?dist}
+Version:       0.46
+Release:       1%{?dist}
 Summary:       User space components of the Ceph file system
 License:       LGPLv2
 Group:         System Environment/Base
@@ -30,6 +30,18 @@ Requires(preun): initscripts
 Ceph is a distributed network file system designed to provide excellent
 performance, reliability, and scalability.
 
+%package libs
+Summary:       Ceph libraries
+Group:         System Environment/Libraries
+%description libs
+Common libraries for Ceph distributed network file system
+
+%package libcephfs
+Summary:       Ceph libcephfs libraries
+Group:         System Environment/Libraries
+%description libcephfs
+libcephfs library for Ceph distributed network file system
+
 %package       fuse
 Summary:       Ceph fuse-based client
 Group:         System Environment/Base
@@ -43,6 +55,8 @@ Summary:     Ceph headers
 Group:       Development/Libraries
 License:     LGPLv2
 Requires:    %{name} = %{version}-%{release}
+Requires:    %{name}-libs = %{version}-%{release}
+Requires:    %{name}-libcephfs = %{version}-%{release}
 %description devel
 This package contains the headers needed to develop programs that use Ceph.
 
@@ -90,7 +104,7 @@ file system.
 
 %ifarch armv5tel
 # libatomic_ops does not have correct asm for ARMv5tel
-EXTRA_CFLAGS="-DAO_USE_PTHREAD_DEFS"
+EXTRA_CFLAGS="-DAO_USE_PTHREAD_DEFS -fvisibility-inlines-hidden"
 %endif
 %ifarch %{arm}
 # libatomic_ops seems to fallback on some pthread implementation on ARM
@@ -123,7 +137,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add ceph
 
 %preun
@@ -133,11 +146,15 @@ if [ $1 = 0 ] ; then
 fi
 
 %postun
-/sbin/ldconfig
 if [ "$1" -ge "1" ] ; then
     /sbin/service ceph condrestart >/dev/null 2>&1 || :
 fi
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%post libcephfs -p /sbin/ldconfig
+%postun libcephfs -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc README COPYING
@@ -163,12 +180,6 @@ fi
 %{_bindir}/ceph-coverage
 %{_bindir}/ceph-dencoder
 %{_initrddir}/ceph
-%{_libdir}/libcephfs.so.*
-%{_libdir}/librados.so.*
-%{_libdir}/librbd.so.*
-%{_libdir}/librgw.so.*
-%{_libdir}/rados-classes/libcls_rbd.so.*
-%{_libdir}/rados-classes/libcls_rgw.so*
 /sbin/mkcephfs
 /sbin/mount.ceph
 %{_libdir}/ceph
@@ -200,12 +211,25 @@ fi
 %{_mandir}/man8/ceph-clsinfo.8*
 %{_mandir}/man8/ceph-dencoder.8*
 %{python_sitelib}/rados.py*
-%{python_sitelib}/rgw.py*
 %{python_sitelib}/rbd.py*
 %dir %{_localstatedir}/lib/ceph/
 %dir %{_localstatedir}/lib/ceph/tmp/
 %dir %{_localstatedir}/log/ceph/
 
+%files libs
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/librados.so.*
+%{_libdir}/librbd.so.*
+%{_libdir}/librgw.so.*
+%{_libdir}/rados-classes/libcls_rbd.so.*
+%{_libdir}/rados-classes/libcls_rgw.so*
+
+%files libcephfs
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/libcephfs.so.*
+
 %files fuse
 %defattr(-,root,root,-)
 %doc COPYING
@@ -252,6 +276,10 @@ fi
 %{_bindir}/boto_tool
 
 %changelog
+* Wed May  9 2012 Josef Bacik <josef@toxicpanda.com> - 0.46-1
+- updated to upstream 0.46
+- broke out libcephfs (rhbz# 812975)
+
 * Mon Apr 23 2012 Dan Horák <dan[at]danny.cz> - 0.45-2
 - fix detection of C++11 atomic header
 
diff --git a/sources b/sources
index eea0bd0..fad6590 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb15526c87a3c7c8bd739a81be618e26  ceph-0.45.tar.bz2
+39ea22880d3fee15161c77980f1fa046  ceph-0.46.tar.bz2