Merge branch 'master' into f18
Conflicts: ceph.spec
This commit is contained in:
commit
5b135f1378
2
.gitignore
vendored
2
.gitignore
vendored
@ -10,3 +10,5 @@ ceph-0.20.tar.gz
|
|||||||
/ceph-0.45.tar.bz2
|
/ceph-0.45.tar.bz2
|
||||||
/ceph-0.46.tar.bz2
|
/ceph-0.46.tar.bz2
|
||||||
/ceph-0.51.tar.bz2
|
/ceph-0.51.tar.bz2
|
||||||
|
/ceph-0.53.tar.bz2
|
||||||
|
/ceph-0.56.3.tar.bz2
|
||||||
|
@ -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
|
|
53
ceph.spec
53
ceph.spec
@ -1,6 +1,6 @@
|
|||||||
Name: ceph
|
Name: ceph
|
||||||
Version: 0.51
|
Version: 0.56.3
|
||||||
Release: 3%{?dist}.1
|
Release: 1%{?dist}
|
||||||
Summary: User space components of the Ceph file system
|
Summary: User space components of the Ceph file system
|
||||||
License: LGPLv2
|
License: LGPLv2
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@ -8,8 +8,7 @@ URL: http://ceph.com/
|
|||||||
|
|
||||||
Source: http://ceph.com/download/%{name}-%{version}.tar.bz2
|
Source: http://ceph.com/download/%{name}-%{version}.tar.bz2
|
||||||
Patch0: ceph-init-fix.patch
|
Patch0: ceph-init-fix.patch
|
||||||
Patch1: ceph.logrotate.patch
|
Patch1: ceph-build-support-for-automake-1.12.patch
|
||||||
Patch2: ceph-build-support-for-automake-1.12.patch
|
|
||||||
|
|
||||||
BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel,
|
BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel,
|
||||||
BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, libaio-devel,
|
BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, libaio-devel,
|
||||||
@ -72,22 +71,10 @@ 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
|
implemented as a FastCGI module using libfcgi, and can be used in
|
||||||
conjunction with any FastCGI capable web server.
|
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
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .init
|
%patch0 -p1 -b .init
|
||||||
%patch1 -p0
|
%patch1 -p1
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
@ -101,7 +88,7 @@ EXTRA_CFLAGS="-DAO_USE_PTHREAD_DEFS"
|
|||||||
EXTRA_LDFLAGS="-lpthread"
|
EXTRA_LDFLAGS="-lpthread"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%{configure} --prefix=/usr --sbindir=/sbin \
|
%{configure} --prefix=/usr --sbindir=%{_sbindir} \
|
||||||
--localstatedir=/var --sysconfdir=/etc \
|
--localstatedir=/var --sysconfdir=/etc \
|
||||||
%ifarch ppc ppc64 s390 s390x
|
%ifarch ppc ppc64 s390 s390x
|
||||||
--without-tcmalloc \
|
--without-tcmalloc \
|
||||||
@ -170,10 +157,11 @@ fi
|
|||||||
%{_bindir}/ceph-coverage
|
%{_bindir}/ceph-coverage
|
||||||
%{_bindir}/ceph-dencoder
|
%{_bindir}/ceph-dencoder
|
||||||
%{_initrddir}/ceph
|
%{_initrddir}/ceph
|
||||||
/sbin/mkcephfs
|
%{_sbindir}/mkcephfs
|
||||||
/sbin/mount.ceph
|
%{_sbindir}/mount.ceph
|
||||||
/sbin/ceph-disk-activate
|
%{_sbindir}/ceph-disk-activate
|
||||||
/sbin/ceph-disk-prepare
|
%{_sbindir}/ceph-disk-prepare
|
||||||
|
%{_sbindir}/ceph-create-keys
|
||||||
%{_libdir}/ceph
|
%{_libdir}/ceph
|
||||||
%{_docdir}/ceph/sample.ceph.conf
|
%{_docdir}/ceph/sample.ceph.conf
|
||||||
%{_docdir}/ceph/sample.fetch_config
|
%{_docdir}/ceph/sample.fetch_config
|
||||||
@ -202,7 +190,6 @@ fi
|
|||||||
%{_mandir}/man8/ceph-debugpack.8*
|
%{_mandir}/man8/ceph-debugpack.8*
|
||||||
%{_mandir}/man8/ceph-clsinfo.8*
|
%{_mandir}/man8/ceph-clsinfo.8*
|
||||||
%{_mandir}/man8/ceph-dencoder.8*
|
%{_mandir}/man8/ceph-dencoder.8*
|
||||||
%{_mandir}/man1/obsync.1*
|
|
||||||
%{_mandir}/man8/ceph-rbdnamer.8*
|
%{_mandir}/man8/ceph-rbdnamer.8*
|
||||||
%{python_sitelib}/rados.py*
|
%{python_sitelib}/rados.py*
|
||||||
%{python_sitelib}/rbd.py*
|
%{python_sitelib}/rbd.py*
|
||||||
@ -218,6 +205,8 @@ fi
|
|||||||
%{_libdir}/rados-classes/libcls_rbd.so.*
|
%{_libdir}/rados-classes/libcls_rbd.so.*
|
||||||
%{_libdir}/rados-classes/libcls_rgw.so*
|
%{_libdir}/rados-classes/libcls_rgw.so*
|
||||||
%{_libdir}/rados-classes/libcls_lock*
|
%{_libdir}/rados-classes/libcls_lock*
|
||||||
|
%{_libdir}/rados-classes/libcls_kvs*
|
||||||
|
%{_libdir}/rados-classes/libcls_refcount*
|
||||||
|
|
||||||
%files libcephfs
|
%files libcephfs
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
@ -228,6 +217,7 @@ fi
|
|||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc COPYING
|
%doc COPYING
|
||||||
%{_bindir}/ceph-fuse
|
%{_bindir}/ceph-fuse
|
||||||
|
%{_sbindir}/mount.fuse.ceph
|
||||||
%{_mandir}/man8/ceph-fuse.8*
|
%{_mandir}/man8/ceph-fuse.8*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
@ -246,6 +236,7 @@ fi
|
|||||||
#%{_includedir}/rados/librgw.h
|
#%{_includedir}/rados/librgw.h
|
||||||
%{_includedir}/rbd/librbd.h
|
%{_includedir}/rbd/librbd.h
|
||||||
%{_includedir}/rbd/librbd.hpp
|
%{_includedir}/rbd/librbd.hpp
|
||||||
|
%{_includedir}/rbd/features.h
|
||||||
%{_libdir}/libcephfs.so
|
%{_libdir}/libcephfs.so
|
||||||
%{_libdir}/librados.so
|
%{_libdir}/librados.so
|
||||||
#%{_libdir}/librgw.so
|
#%{_libdir}/librgw.so
|
||||||
@ -260,13 +251,17 @@ fi
|
|||||||
%{_bindir}/radosgw-admin
|
%{_bindir}/radosgw-admin
|
||||||
%{_sysconfdir}/bash_completion.d/radosgw-admin
|
%{_sysconfdir}/bash_completion.d/radosgw-admin
|
||||||
|
|
||||||
%files obsync
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_bindir}/obsync
|
|
||||||
%{_bindir}/boto_tool
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Sep 24 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.51-3.1
|
* Wed Feb 20 2013 Josef Bacik <josef@toxicpanda.com> - 0.56.3-1
|
||||||
|
- Update to 0.56.3
|
||||||
|
|
||||||
|
* Mon Feb 11 2013 Richard W.M. Jones <rjones@redhat.com> - 0.53-2
|
||||||
|
- Rebuilt to try to fix boost dependency problem in Rawhide.
|
||||||
|
|
||||||
|
* Thu Nov 1 2012 Josef Bacik <josef@toxicpanda.com> - 0.53-1
|
||||||
|
- Update to 0.53
|
||||||
|
|
||||||
|
* Mon Sep 24 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.51-3
|
||||||
- Fix automake 1.12 error
|
- Fix automake 1.12 error
|
||||||
- Rebuild after buildroot was messed up
|
- Rebuild after buildroot was messed up
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user