Compare commits

..

23 Commits

Author SHA1 Message Date
Boris Ranto 373a4fde21 New release (1:0.94.7-2)
- Workaround xfs.h check
2016-05-16 20:56:12 +02:00
Boris Ranto 8c6c0bc84b New version (1:0.94.7-1)
- Disable erasure_codelib neon build
- init-ceph.in: Allow custom cluster names during startup.
- Apply 'ceph-0.94.1-tcmalloc.patch'
- Apply 'init-ceph.in-fedora.patch'
2016-05-16 15:49:01 +02:00
Boris Ranto c124767d87 Rebase to version 0.94.6 2016-02-23 18:10:02 +01:00
Boris Ranto d2c3e8a99e Allow setting custom cluster names in init script
Also, remove unused patch file.

Resolves: rhbz#1269436
2015-12-09 13:52:04 +01:00
Boris Ranto 58a926ad22 Rebase to latest upstream version (0.94.5) 2015-10-27 16:05:32 +01:00
Boris Ranto a127e04b4b Post-rebase fix-up
The init-radosgw.sysv file was renamed to init-radosgw file in 0.94.4.
2015-10-20 14:49:23 +02:00
Boris Ranto 4ded3cb8c5 Rebase to latest upstream version (0.94.4)
The rtdsc patch got merged upstream and is already present in the release
2015-10-20 12:22:29 +02:00
Jonathan Wakely 94662be077 Rebuilt for Boost 1.59 2015-10-20 12:22:21 +02:00
Boris Ranto aa5aa9c8cf Fix file list after rebase
Resolves: rhbz#1257374
2015-08-28 09:44:00 +02:00
Boris Ranto 6f8a9b9b1f Rebase to latest upstream version (0.94.3)
Resolves: rhbz#1257374
2015-08-28 09:43:55 +02:00
Richard W.M. Jones 822933e3ed Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576). 2015-08-05 22:34:59 -05:00
Dennis Gilmore dd200ec89a - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 2015-07-29 12:04:24 -05:00
David Tardon 8b22c27cbd rebuild for Boost 1.58 2015-07-23 09:28:47 +02:00
Boris Ranto 989a021ac8 Rebase to latest upstream version (0.94.2)
Resolves: rhbz#1229924
2015-07-16 13:56:25 +02:00
Dennis Gilmore 9b5287b8d1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 02:30:12 +00:00
Dan Horák 94d715c6db - fix build on s390(x) - no gperftools there 2015-06-08 17:43:13 +02:00
Boris Ranto c767eafe44 Disable lttng support
Resolves: rhbz#1223319
2015-05-21 11:03:50 +02:00
Boris Ranto 300509739c Fix arm linking issue
Resolves: rhbz#1222286
2015-05-18 20:34:11 +02:00
Boris Ranto bedf031a7d Fix arm compilation issues 2015-04-16 13:10:30 +02:00
Boris Ranto 2a379f1396 Rebase to latest upstream (0.94.1) and sync-up spec file 2015-04-14 17:09:59 +02:00
Ken Dreyer a6871cb0d5 add version numbers to Obsoletes
The ceph-devel and python-ceph packages were split out, but there were
no version numbers added to the Obsoletes during the split.

This means that we obsolete packages that are far newer than us. This
impacts packages coming from upstream's "gitbuilder" system (for
example), as well as any other upstream RPMs until this package split is
done upstream.

Add version numbers to the Obsoletes. I've chosen to use a
version+release number that's lower than what we currently ship in
Fedora (0.87-1), but newer than what we shipped in the last Fedora
update (0.80.6-1).
2015-04-01 09:04:15 -06:00
Boris Ranto 2a0aaf952c Fix several issues with spec file
- Perform a hardened build
- Use git-formatted patches
- Add patch for pthreads rwlock unlock problem
- Do not remove conf files on uninstall
- Remove the cleanup function, it is only necessary for f20 and f21
2015-03-04 16:13:36 +01:00
Boris Ranto 84aa853323 Rebase to 0.87.1 2015-02-25 11:33:57 +01:00
2 changed files with 43 additions and 1 deletions
+36
View File
@@ -0,0 +1,36 @@
From d02ac8fd60e692da2257a1d963279091ef47e312 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Mon, 16 May 2016 20:53:28 +0200
Subject: [PATCH] Workaround xfs.h check
The check for <xfs/xfs.h> in fedora 23 is broken. See e.g.:
http://www.spinics.net/lists/ceph-devel/msg29467.html
This should not be too critical and the package should build just fine
anyway. Commenting out the bits that check for xfs.h should help us,
here.
Signed-off-by: Boris Ranto <branto@redhat.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index d1f98aa..e068fdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -814,8 +814,8 @@ AC_ARG_WITH([libxfs],
[with_libxfs=yes])
AS_IF([test "x$with_libxfs" != "xno"], [
# xfs/xfs.h presence and XFS_XFLAG_EXTSIZE define
- AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
- [xfs/xfs.h not found (--without-libxfs to disable)]))
+ #AC_CHECK_HEADER([xfs/xfs.h], [], AC_MSG_ERROR(
+ # [xfs/xfs.h not found (--without-libxfs to disable)]))
AC_MSG_CHECKING([for XFS_XFLAG_EXTSIZE in xfs/xfs.h])
AC_EGREP_CPP([yes_have_xfs_xflag_extsize], [
#include <xfs/xfs.h>
--
2.5.5
+7 -1
View File
@@ -12,7 +12,7 @@
#################################################################################
Name: ceph
Version: 0.94.7
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 1
Summary: User space components of the Ceph file system
License: GPLv2
@@ -23,6 +23,7 @@ Patch1: 0001-Disable-erasure_codelib-neon-build.patch
Patch2: 0002-init-ceph.in-Allow-custom-cluster-names-during-start.patch
Patch3: 0003-Apply-ceph-0.94.1-tcmalloc.patch.patch
Patch4: 0004-Apply-init-ceph.in-fedora.patch.patch
Patch5: 0005-Workaround-xfs.h-check.patch
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
%endif
# fix build without tcmalloc
@@ -430,6 +431,7 @@ python-cephfs instead.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
%endif
@@ -935,6 +937,10 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
# actually build this meta package.
%changelog
* Mon May 16 2016 Boris Ranto <branto@redhat.com> - 1:0.94.7-2
- New release (1:0.94.7-2)
- Workaround xfs.h check
* Mon May 16 2016 Boris Ranto <branto@redhat.com> - 1:0.94.7-1
- New version (1:0.94.7-1)
- Disable erasure_codelib neon build