From c0a0a52a8b3ed9d5dec50d62fa4c1bd7116adbc7 Mon Sep 17 00:00:00 2001 From: David Nalley Date: Fri, 13 Jan 2012 14:06:41 -0500 Subject: [PATCH] fixing bug 773194 and upgrading to 0.39 in the process --- .gitignore | 1 + ceph.logrotate.patch | 11 ++++------- ceph.spec | 14 ++++++-------- sources | 2 +- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index b4aad9f..2404c22 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ceph-0.20.tar.gz /ceph-0.26.tar.gz /ceph-0.31.tar.gz /ceph-0.37.tar.gz +/ceph-0.39.tar.gz diff --git a/ceph.logrotate.patch b/ceph.logrotate.patch index 5309443..6ded86e 100644 --- a/ceph.logrotate.patch +++ b/ceph.logrotate.patch @@ -1,14 +1,11 @@ ---- src/logrotate.conf 2011-07-30 16:50:50.000000000 -0400 -+++ src/logrotate.conf.new 2011-11-05 17:41:02.567151275 -0400 -@@ -1,9 +1,10 @@ - /var/log/ceph/*.log { - rotate 7 - daily -+ missingok +--- ./src/logrotate.conf.new 2012-01-11 18:23:10.597593501 -0500 ++++ ./src/logrotate.conf 2012-01-11 18:23:26.808390838 -0500 +@@ -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 } diff --git a/ceph.spec b/ceph.spec index 1cba4d9..43ab4d0 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,6 +1,6 @@ Name: ceph -Version: 0.37 -Release: 3%{?dist} +Version: 0.39 +Release: 1%{?dist} Summary: User space components of the Ceph file system License: LGPLv2 Group: System Environment/Base @@ -15,8 +15,9 @@ BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, %ifnarch ppc64 s390 s390x BuildRequires: google-perftools-devel %endif -BuildRequires: cryptopp-devel, libatomic_ops-static +BuildRequires: cryptopp-devel, libatomic_ops-devel, gcc-c++ BuildRequires: pkgconfig, libcurl-devel, keyutils-libs-devel +BuildRequires: gtkmm24-devel, gtk2-devel, libuuid, libuuid-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig, binutils, libedit Requires(preun): chkconfig @@ -234,11 +235,8 @@ fi %{_bindir}/boto_tool %changelog -* Thu Jan 12 2012 Fedora Release Engineering - 0.37-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 09 2011 David Nalley 0.37-2 -- making ceph spec file comply with static library deps guidelines 609700 +* Sat Dec 03 2011 David Nalley 0.38-1 +- updating to upstream 0.39 * Sat Nov 05 2011 David Nalley 0.37-1 - create /etc/ceph - bug 745462 diff --git a/sources b/sources index 3ef34ea..8fec600 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b97598058588907982c6e8df465ffa1a ceph-0.37.tar.gz +8dcc078604c54d10085b6990ef554738 ceph-0.39.tar.gz