From 3991b7a14dc7a750ff046e6c39ec5ebb5db256f3 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Feb 21 2013 21:37:30 +0000 Subject: - update to 0.56.3 --- 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