Compare commits

..

6 Commits

Author SHA1 Message Date
Tom Callaway 79ba39cd11 rebuild against gperftools 2012-02-16 21:36:29 -05:00
David Nalley f6bd21aaa2 fixing bug 773194 and updating to 0.39 in the process 2012-01-13 14:04:38 -05:00
David Nalley 07057e050a Merge branch 'f16' of ssh://pkgs.fedoraproject.org/ceph into origin/f16 2012-01-13 14:02:10 -05:00
David Nalley 18879ad313 complying with -static lib guidelines bz: 609700 2011-11-09 11:57:37 -05:00
Josef Bacik 0e4cc7c1b7 -forgot to add the logrotate patch 2011-11-07 12:00:43 -05:00
Josef Bacik 8cb6eae323 -updating ceph in f16 to 0.37 2011-11-07 11:54:54 -05:00
7 changed files with 82 additions and 202 deletions
-9
View File
@@ -5,12 +5,3 @@ ceph-0.20.tar.gz
/ceph-0.31.tar.gz
/ceph-0.37.tar.gz
/ceph-0.39.tar.gz
/ceph-0.43.tar.bz2
/ceph-0.44.tar.bz2
/ceph-0.45.tar.bz2
/ceph-0.46.tar.bz2
/ceph-0.51.tar.bz2
/ceph-0.53.tar.bz2
/ceph-0.56.3.tar.bz2
/ceph-0.56.4.tar.bz2
/ceph-0.61.7.tar.bz2
@@ -1,13 +0,0 @@
diff -urb ceph-0.51/configure.ac ceph-0.51b/configure.ac
--- ceph-0.51/configure.ac 2012-08-26 01:58:14.000000000 +0300
+++ ceph-0.51b/configure.ac 2012-09-24 09:19:20.791969694 +0300
@@ -17,6 +17,9 @@
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
+# fix automake problems in 1.12
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
# Automake
AM_INIT_AUTOMAKE
AM_PROG_CC_C_O
-12
View File
@@ -1,12 +0,0 @@
diff -up ceph-0.61.7/src/Makefile.am.fix-sbin ceph-0.61.7/src/Makefile.am
--- ceph-0.61.7/src/Makefile.am.fix-sbin 2013-07-26 11:52:56.355915758 -0400
+++ ceph-0.61.7/src/Makefile.am 2013-07-26 11:53:09.502808374 -0400
@@ -28,7 +28,7 @@ bin_PROGRAMS =
bin_DEBUGPROGRAMS =
sbin_PROGRAMS =
# like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
-ceph_sbindir = $(prefix)$(sbindir)
+ceph_sbindir = $(sbindir)
ceph_sbin_SCRIPTS = \
ceph-disk \
ceph-disk-prepare \
+2 -3
View File
@@ -1,6 +1,5 @@
diff -up ceph-0.46/src/init-ceph.in.orig ceph-0.46/src/init-ceph.in
--- ceph-0.46/src/init-ceph.in.orig 2012-04-24 16:06:39.000000000 -0400
+++ ceph-0.46/src/init-ceph.in 2012-05-09 16:41:36.500004052 -0400
--- ceph-0.21.1/src/init-ceph.in.orig 2010-07-29 15:16:49.000000000 -0500
+++ ceph-0.21.1/src/init-ceph.in 2010-08-26 14:58:25.328581937 -0500
@@ -1,11 +1,11 @@
#!/bin/sh
# Start/stop ceph daemons
+11
View File
@@ -0,0 +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
@@ -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
}
+68 -164
View File
@@ -1,27 +1,24 @@
Name: ceph
Version: 0.61.7
Release: 1%{?dist}
Version: 0.39
Release: 2%{?dist}
Summary: User space components of the Ceph file system
License: LGPLv2
Group: System Environment/Base
URL: http://ceph.com/
URL: http://ceph.newdream.net/
Source: http://ceph.com/download/%{name}-%{version}.tar.bz2
Source: http://ceph.newdream.net/download/%{name}-%{version}.tar.gz
Patch0: ceph-init-fix.patch
Patch1: ceph-build-support-for-automake-1.12.patch
Patch2: ceph-fix-sbin-target.patch
Patch1: ceph.logrotate.patch
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,
# google-perftools is not available on these:
%ifnarch ppc ppc64 s390 s390x armv7hl
%ifnarch ppc64 s390 s390x
BuildRequires: gperftools-devel
%endif
BuildRequires: cryptopp-devel, libatomic_ops-static, gcc-c++
BuildRequires: cryptopp-devel, libatomic_ops-devel, gcc-c++
BuildRequires: pkgconfig, libcurl-devel, keyutils-libs-devel
BuildRequires: gtkmm24-devel, gtk2-devel, libuuid, libuuid-devel
BuildRequires: leveldb-devel, snappy-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig, binutils, libedit
Requires(preun): chkconfig
Requires(preun): initscripts
@@ -30,18 +27,6 @@ Requires(preun): initscripts
Ceph is a distributed network file system designed to provide excellent
performance, reliability, and scalability.
%package libs
Summary: Ceph libraries
Group: System Environment/Libraries
%description libs
Common libraries for Ceph distributed network file system
%package libcephfs
Summary: Ceph libcephfs libraries
Group: System Environment/Libraries
%description libcephfs
libcephfs library for Ceph distributed network file system
%package fuse
Summary: Ceph fuse-based client
Group: System Environment/Base
@@ -55,8 +40,6 @@ Summary: Ceph headers
Group: Development/Libraries
License: LGPLv2
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-libcephfs = %{version}-%{release}
%description devel
This package contains the headers needed to develop programs that use Ceph.
@@ -72,37 +55,44 @@ 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.
%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 -p1
%patch2 -p1
%patch1 -p0
%build
./autogen.sh
%ifarch armv5tel
# libatomic_ops does not have correct asm for ARMv5tel
EXTRA_CFLAGS="-DAO_USE_PTHREAD_DEFS"
%endif
%ifarch %{arm}
# libatomic_ops seems to fallback on some pthread implementation on ARM
EXTRA_LDFLAGS="-lpthread"
%endif
%{configure} --prefix=%{_prefix} --sbindir=%{_sbindir} \
--localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir} \
%ifarch ppc ppc64 s390 s390x armv7hl
%{configure} --prefix=/usr --sbindir=/sbin \
--localstatedir=/var --sysconfdir=/etc \
%ifarch ppc64 s390 s390x
--without-tcmalloc \
%endif
--with-system-leveldb --without-hadoop --with-radosgw --with-gtk2 \
CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS -fvisibility-inlines-hidden" \
LDFLAGS="$EXTRA_LDFLAGS"
make %{?_smp_mflags}
--without-hadoop --with-radosgw --with-gtk2
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
@@ -114,8 +104,11 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/stat
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
/sbin/chkconfig --add ceph
%preun
@@ -125,20 +118,15 @@ if [ $1 = 0 ] ; then
fi
%postun
/sbin/ldconfig
if [ "$1" -ge "1" ] ; then
/sbin/service ceph condrestart >/dev/null 2>&1 || :
fi
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%post libcephfs -p /sbin/ldconfig
%postun libcephfs -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc README COPYING
%dir %{_sysconfdir}/ceph
%dir %{_docdir}/ceph
%{_bindir}/ceph
%{_bindir}/cephfs
%{_bindir}/ceph-conf
@@ -158,17 +146,15 @@ fi
%{_bindir}/rbd
%{_bindir}/ceph-debugpack
%{_bindir}/ceph-coverage
%{_bindir}/ceph-dencoder
%{_bindir}/ceph_filestore_dump
%{_bindir}/ceph_mon_store_converter
%{_initrddir}/ceph
%{_sbindir}/mkcephfs
%{_sbindir}/mount.ceph
%{_sbindir}/ceph-disk-activate
%{_sbindir}/ceph-disk-prepare
%{_sbindir}/ceph-create-keys
%{_sbindir}/ceph-disk
%{_sbindir}/ceph-disk-udev
%{_libdir}/libcephfs.so.*
%{_libdir}/librados.so.*
%{_libdir}/librbd.so.*
%{_libdir}/librgw.so.*
%{_libdir}/rados-classes/libcls_rbd.so.*
%{_libdir}/rados-classes/libcls_rgw.so*
/sbin/mkcephfs
/sbin/mount.ceph
%{_libdir}/ceph
%{_docdir}/ceph/sample.ceph.conf
%{_docdir}/ceph/sample.fetch_config
@@ -195,67 +181,47 @@ fi
%{_mandir}/man8/rbd.8*
%{_mandir}/man8/ceph-authtool.8*
%{_mandir}/man8/ceph-debugpack.8*
%{_mandir}/man8/ceph-clsinfo.8*
%{_mandir}/man8/ceph-dencoder.8*
%{_mandir}/man8/ceph-rbdnamer.8*
%{_mandir}/man8/ceph-clsinfo.8.gz
%{python_sitelib}/rados.py*
%{python_sitelib}/rgw.py*
%{python_sitelib}/rbd.py*
%{python_sitelib}/cephfs.py*
%dir %{_localstatedir}/lib/ceph/
%dir %{_localstatedir}/lib/ceph/tmp/
%dir %{_localstatedir}/log/ceph/
%files libs
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/librados.so.*
%{_libdir}/librbd.so.*
%{_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,-)
%doc COPYING
%{_libdir}/libcephfs.so.*
%files fuse
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/ceph-fuse
%{_bindir}/rbd-fuse
%{_sbindir}/mount.fuse.ceph
%{_mandir}/man8/ceph-fuse.8*
%{_mandir}/man8/rbd-fuse.8*
%files devel
%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/rados_types.h
%{_includedir}/rados/rados_types.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
%{_includedir}/rbd/features.h
%{_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,-)
@@ -263,75 +229,13 @@ fi
%{_bindir}/radosgw-admin
%{_sysconfdir}/bash_completion.d/radosgw-admin
%files obsync
%defattr(-,root,root,-)
%{_bindir}/obsync
%{_bindir}/boto_tool
%changelog
* Mon Jul 29 2013 Josef Bacik <josef@toxicpanda.com> - 0.61.7-1
- Update to 0.61.7
* Sat Jul 27 2013 pmachata@redhat.com - 0.56.4-2
- Rebuild for boost 1.54.0
* Fri Mar 29 2013 Josef Bacik <josef@toxicpanda.com> - 0.56.4-1
- Update to 0.56.4
- Add upstream d02340d90c9d30d44c962bea7171db3fe3bfba8e to fix logrotate
* 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
- Rebuild after buildroot was messed up
* Tue Sep 18 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.51-2
- Use system leveldb
* Fri Sep 07 2012 David Nalley <david@gnsa.us> - 0.51-1
- Updating to 0.51
- Updated url and source url.
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.46-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Wed May 9 2012 Josef Bacik <josef@toxicpanda.com> - 0.46-1
- updated to upstream 0.46
- broke out libcephfs (rhbz# 812975)
* Mon Apr 23 2012 Dan Horák <dan[at]danny.cz> - 0.45-2
- fix detection of C++11 atomic header
* Thu Apr 12 2012 Josef Bacik <josef@toxicpanda.com> - 0.45-1
- updating to upstream 0.45
* Wed Apr 4 2012 Niels de Vos <devos@fedoraproject.org> - 0.44-5
- Add LDFLAGS=-lpthread on any ARM architecture
- Add CFLAGS=-DAO_USE_PTHREAD_DEFS on ARMv5tel
* Mon Mar 26 2012 Dan Horák <dan[at]danny.cz> 0.44-4
- gperftools not available also on ppc
* Mon Mar 26 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.44-3
- Remove unneeded patch
* Sun Mar 25 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.44-2
- Update to 0.44
- Fix build problems
* Mon Mar 5 2012 Jonathan Dieter <jdieter@lesbg.com> - 0.43-1
- Update to 0.43
- Remove upstreamed compile fixes patch
- Remove obsoleted dump_pop patch
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.41-2
- Rebuilt for c++ ABI breakage
* Thu Feb 16 2012 Tom Callaway <spot@fedoraproject.org> 0.41-1
- update to 0.41
- fix issues preventing build
* Thu Feb 16 2012 Tom Callaway <spot@fedoraproject.org> 0.39-2
- rebuild against gperftools
* Sat Dec 03 2011 David Nalley <david@gnsa.us> 0.38-1
@@ -395,7 +299,7 @@ fi
- Include rbdtool
- Remove misc debugging, test binaries
* Fri Apr 30 2010 Josef Bacik <josef@toxicpanda.com> 0.19.1-4
* Thu Apr 30 2010 Josef Bacik <josef@toxicpanda.com> 0.19.1-4
- Add java-devel and java tricks to get hadoop to build
* Mon Apr 26 2010 Josef Bacik <josef@toxicpanda.com> 0.19.1-3
+1 -1
View File
@@ -1 +1 @@
1c00b9db5a65b03448226d828e274fe2 ceph-0.61.7.tar.bz2
8dcc078604c54d10085b6990ef554738 ceph-0.39.tar.gz