[ceph] updating to 0.51

David Nalley ke4qqq at fedoraproject.org
Sun Sep 9 17:42:40 UTC 2012


commit 6449f9542438dcdd615f2bf2c93f3a44c14f08c5
Author: David Nalley <david at gnsa.us>
Date:   Sun Sep 9 13:41:08 2012 -0400

    updating to 0.51

 .gitignore                                         |    1 +
 ...x-modules-that-cannot-find-pk11pub.h-when.patch |   52 --------------------
 ceph-gxx-atomic.patch                              |   51 -------------------
 ceph.logrotate.patch                               |   10 ++--
 ceph.spec                                          |   45 ++++++-----------
 sources                                            |    2 +-
 6 files changed, 24 insertions(+), 137 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0c2b20..42ab938 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ ceph-0.20.tar.gz
 /ceph-0.44.tar.bz2
 /ceph-0.45.tar.bz2
 /ceph-0.46.tar.bz2
+/ceph-0.51.tar.bz2
diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch
index 6ded86e..1cdb7d1 100644
--- a/ceph.logrotate.patch
+++ b/ceph.logrotate.patch
@@ -1,11 +1,11 @@
---- ./src/logrotate.conf.new	2012-01-11 18:23:10.597593501 -0500
-+++ ./src/logrotate.conf	2012-01-11 18:23:26.808390838 -0500
+--- 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 @@
      compress
      sharedscripts
      postrotate
 -        invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
 +        service ceph reload >/dev/null 2>/dev/null || true
-     endscript
-     missingok
- }
+ 
+ 	# upstart reload isn't very helpful here:
+ 	#   https://bugs.launchpad.net/upstart/+bug/1012938
diff --git a/ceph.spec b/ceph.spec
index 410c1e8..63d8c98 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,16 +1,14 @@
 Name:          ceph
-Version:       0.46
-Release:       2%{?dist}
+Version:       0.51
+Release:       1%{?dist}
 Summary:       User space components of the Ceph file system
 License:       LGPLv2
 Group:         System Environment/Base
-URL:           http://ceph.newdream.net/
+URL:           http://ceph.com/
 
-Source:        http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
+Source:        http://ceph.com/download/%{name}-%{version}.tar.bz2
 Patch0:        ceph-init-fix.patch
 Patch1:        ceph.logrotate.patch
-# http://tracker.newdream.net/issues/2329
-Patch2:        ceph-gxx-atomic.patch
 
 BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel, 
 BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, libaio-devel,
@@ -82,22 +80,11 @@ obsync is a tool to synchronize objects between cloud object
 storage providers, such as Amazon S3 (or compatible services), a
 Ceph RADOS cluster, or a local directory.
 
-%package gcephtool
-Summary:        Ceph graphical monitoring tool
-Group:          System Environment/Base
-License:        LGPLv2
-Requires:       gtk2 gtkmm24
-BuildRequires:  gtk2-devel gtkmm24-devel
-
-%description gcephtool
-gcephtool is a graphical monitor for the clusters running the Ceph distributed
-file system.
 
 %prep
 %setup -q
 %patch0 -p1 -b .init
 %patch1 -p0
-%patch2 -p1 -b .atomic
 
 %build
 ./autogen.sh
@@ -182,6 +169,8 @@ fi
 %{_initrddir}/ceph
 /sbin/mkcephfs
 /sbin/mount.ceph
+/sbin/ceph-disk-activate
+/sbin/ceph-disk-prepare
 %{_libdir}/ceph
 %{_docdir}/ceph/sample.ceph.conf
 %{_docdir}/ceph/sample.fetch_config
@@ -223,9 +212,9 @@ fi
 %doc COPYING
 %{_libdir}/librados.so.*
 %{_libdir}/librbd.so.*
-%{_libdir}/librgw.so.*
 %{_libdir}/rados-classes/libcls_rbd.so.*
 %{_libdir}/rados-classes/libcls_rgw.so*
+%{_libdir}/rados-classes/libcls_lock*
 
 %files libcephfs
 %defattr(-,root,root,-)
@@ -242,29 +231,25 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING
 %{_includedir}/cephfs/libcephfs.h
-%{_includedir}/crush/crush.h
-%{_includedir}/crush/hash.h
-%{_includedir}/crush/mapper.h
-%{_includedir}/crush/types.h
+#%{_includedir}/crush/crush.h
+#%{_includedir}/crush/hash.h
+#%{_includedir}/crush/mapper.h
+#%{_includedir}/crush/types.h
 %{_includedir}/rados/librados.h
 %{_includedir}/rados/librados.hpp
 %{_includedir}/rados/buffer.h
 %{_includedir}/rados/page.h
 %{_includedir}/rados/crc32c.h
-%{_includedir}/rados/librgw.h
+#%{_includedir}/rados/librgw.h
 %{_includedir}/rbd/librbd.h
 %{_includedir}/rbd/librbd.hpp
 %{_libdir}/libcephfs.so
 %{_libdir}/librados.so
-%{_libdir}/librgw.so
+#%{_libdir}/librgw.so
 %{_libdir}/librbd.so*
 %{_libdir}/rados-classes/libcls_rbd.so
 %{_mandir}/man8/librados-config.8*
 
-%files gcephtool
-%defattr(-,root,root,-)
-%{_bindir}/gceph
-%{_datadir}/ceph_tool/gui_resources/*
 
 %files radosgw
 %defattr(-,root,root,-)
@@ -278,6 +263,10 @@ fi
 %{_bindir}/boto_tool
 
 %changelog
+* Fri Sep 07 2012 David Nalley <david at gnsa.us> - 0.51-1
+- Updating to 0.51
+- Updated url and source url. 
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.46-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index fad6590..227d54f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39ea22880d3fee15161c77980f1fa046  ceph-0.46.tar.bz2
+e4d07eccd79c9a4a9eeee4066f2a13a3  ceph-0.51.tar.bz2


More information about the scm-commits mailing list