From f5c462a933eab3863990c64ef674d26ed5886a1a Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Thu, 1 Nov 2012 11:18:39 -0400 Subject: [PATCH 1/3] - updated to 0.53 --- .gitignore | 1 + ceph.spec | 28 +++++++++------------------- sources | 1 + 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 42ab938..0311f29 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ ceph-0.20.tar.gz /ceph-0.45.tar.bz2 /ceph-0.46.tar.bz2 /ceph-0.51.tar.bz2 +/ceph-0.53.tar.bz2 diff --git a/ceph.spec b/ceph.spec index 46b7196..2a11bee 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,6 +1,6 @@ Name: ceph -Version: 0.51 -Release: 3%{?dist} +Version: 0.53 +Release: 1%{?dist} Summary: User space components of the Ceph file system License: LGPLv2 Group: System Environment/Base @@ -72,17 +72,6 @@ radosgw is an S3 HTTP REST gateway for the RADOS object store. It is implemented as a FastCGI module using libfcgi, and can be used in conjunction with any FastCGI capable web server. -%package obsync -Summary: synchronize data between cloud object storage providers or a local directory -Group: Productivity/Networking/Other -License: LGPLv2 -Requires: python, python-boto -%description obsync -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. - - %prep %setup -q %patch0 -p1 -b .init @@ -174,6 +163,7 @@ fi /sbin/mount.ceph /sbin/ceph-disk-activate /sbin/ceph-disk-prepare +/sbin/ceph-create-keys %{_libdir}/ceph %{_docdir}/ceph/sample.ceph.conf %{_docdir}/ceph/sample.fetch_config @@ -202,7 +192,6 @@ fi %{_mandir}/man8/ceph-debugpack.8* %{_mandir}/man8/ceph-clsinfo.8* %{_mandir}/man8/ceph-dencoder.8* -%{_mandir}/man1/obsync.1* %{_mandir}/man8/ceph-rbdnamer.8* %{python_sitelib}/rados.py* %{python_sitelib}/rbd.py* @@ -218,6 +207,8 @@ fi %{_libdir}/rados-classes/libcls_rbd.so.* %{_libdir}/rados-classes/libcls_rgw.so* %{_libdir}/rados-classes/libcls_lock* +%{_libdir}/rados-classes/libcls_kvs* +%{_libdir}/rados-classes/libcls_refcount* %files libcephfs %defattr(-,root,root,-) @@ -246,6 +237,7 @@ fi #%{_includedir}/rados/librgw.h %{_includedir}/rbd/librbd.h %{_includedir}/rbd/librbd.hpp +%{_includedir}/rbd/features.h %{_libdir}/libcephfs.so %{_libdir}/librados.so #%{_libdir}/librgw.so @@ -260,12 +252,10 @@ fi %{_bindir}/radosgw-admin %{_sysconfdir}/bash_completion.d/radosgw-admin -%files obsync -%defattr(-,root,root,-) -%{_bindir}/obsync -%{_bindir}/boto_tool - %changelog +* Thu Nov 1 2012 Josef Bacik - 0.53-1 +- Update to 0.53 + * Mon Sep 24 2012 Jonathan Dieter - 0.51-3 - Fix automake 1.12 error diff --git a/sources b/sources index 227d54f..ba66b1e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ e4d07eccd79c9a4a9eeee4066f2a13a3 ceph-0.51.tar.bz2 +504f4f9ba6f84178478b08da7bc9eb39 ceph-0.53.tar.bz2 From ffa978b6916df003b647fe2d3e273c07723d4217 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 11 Feb 2013 20:51:34 +0000 Subject: [PATCH 2/3] Rebuilt to try to fix boost dependency problem in Rawhide. --- ceph.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 2a11bee..dc4091b 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,6 +1,6 @@ Name: ceph Version: 0.53 -Release: 1%{?dist} +Release: 2%{?dist} Summary: User space components of the Ceph file system License: LGPLv2 Group: System Environment/Base @@ -253,6 +253,9 @@ fi %{_sysconfdir}/bash_completion.d/radosgw-admin %changelog +* Mon Feb 11 2013 Richard W.M. Jones - 0.53-2 +- Rebuilt to try to fix boost dependency problem in Rawhide. + * Thu Nov 1 2012 Josef Bacik - 0.53-1 - Update to 0.53 From 3991b7a14dc7a750ff046e6c39ec5ebb5db256f3 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Thu, 21 Feb 2013 16:35:14 -0500 Subject: [PATCH 3/3] - update to 0.56.3 --- .gitignore | 1 + ceph.logrotate.patch | 11 ----------- ceph.spec | 26 ++++++++++++++------------ sources | 3 +-- 4 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 ceph.logrotate.patch diff --git a/.gitignore b/.gitignore index 0311f29..4c6a654 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ ceph-0.20.tar.gz /ceph-0.46.tar.bz2 /ceph-0.51.tar.bz2 /ceph-0.53.tar.bz2 +/ceph-0.56.3.tar.bz2 diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch deleted file mode 100644 index 1cdb7d1..0000000 --- a/ceph.logrotate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - - # upstart reload isn't very helpful here: - # https://bugs.launchpad.net/upstart/+bug/1012938 diff --git a/ceph.spec b/ceph.spec index dc4091b..a1ac7df 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,6 +1,6 @@ Name: ceph -Version: 0.53 -Release: 2%{?dist} +Version: 0.56.3 +Release: 1%{?dist} Summary: User space components of the Ceph file system License: LGPLv2 Group: System Environment/Base @@ -8,8 +8,7 @@ URL: http://ceph.com/ Source: http://ceph.com/download/%{name}-%{version}.tar.bz2 Patch0: ceph-init-fix.patch -Patch1: ceph.logrotate.patch -Patch2: ceph-build-support-for-automake-1.12.patch +Patch1: ceph-build-support-for-automake-1.12.patch BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel, BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, libaio-devel, @@ -75,8 +74,7 @@ conjunction with any FastCGI capable web server. %prep %setup -q %patch0 -p1 -b .init -%patch1 -p0 -%patch2 -p1 +%patch1 -p1 %build ./autogen.sh @@ -90,7 +88,7 @@ EXTRA_CFLAGS="-DAO_USE_PTHREAD_DEFS" EXTRA_LDFLAGS="-lpthread" %endif -%{configure} --prefix=/usr --sbindir=/sbin \ +%{configure} --prefix=/usr --sbindir=%{_sbindir} \ --localstatedir=/var --sysconfdir=/etc \ %ifarch ppc ppc64 s390 s390x --without-tcmalloc \ @@ -159,11 +157,11 @@ fi %{_bindir}/ceph-coverage %{_bindir}/ceph-dencoder %{_initrddir}/ceph -/sbin/mkcephfs -/sbin/mount.ceph -/sbin/ceph-disk-activate -/sbin/ceph-disk-prepare -/sbin/ceph-create-keys +%{_sbindir}/mkcephfs +%{_sbindir}/mount.ceph +%{_sbindir}/ceph-disk-activate +%{_sbindir}/ceph-disk-prepare +%{_sbindir}/ceph-create-keys %{_libdir}/ceph %{_docdir}/ceph/sample.ceph.conf %{_docdir}/ceph/sample.fetch_config @@ -219,6 +217,7 @@ fi %defattr(-,root,root,-) %doc COPYING %{_bindir}/ceph-fuse +%{_sbindir}/mount.fuse.ceph %{_mandir}/man8/ceph-fuse.8* %files devel @@ -253,6 +252,9 @@ fi %{_sysconfdir}/bash_completion.d/radosgw-admin %changelog +* Wed Feb 20 2013 Josef Bacik - 0.56.3-1 +- Update to 0.56.3 + * Mon Feb 11 2013 Richard W.M. Jones - 0.53-2 - Rebuilt to try to fix boost dependency problem in Rawhide. diff --git a/sources b/sources index ba66b1e..12047b5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -e4d07eccd79c9a4a9eeee4066f2a13a3 ceph-0.51.tar.bz2 -504f4f9ba6f84178478b08da7bc9eb39 ceph-0.53.tar.bz2 +949c348b95c72e0870fabb033e4d1f8e ceph-0.56.3.tar.bz2