Compare commits

..

22 Commits

Author SHA1 Message Date
Boris Ranto 94b937a7b4 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:54:25 +02:00
Boris Ranto 109b076cb0 Rebase to version 0.94.6 2016-02-23 20:19:04 +01:00
Boris Ranto 3bd965f1b9 Allow setting custom cluster names in init script
Also, remove unused patch file.

Resolves: rhbz#1269436
2015-12-09 13:50:04 +01:00
Boris Ranto 5d0f0722ed Rebase to latest upstream version (0.94.5) 2015-10-27 16:06:00 +01:00
Boris Ranto c5765fadbd Post-rebase fix-up
The init-radosgw.sysv file was renamed to init-radosgw file in 0.94.4.
2015-10-20 14:50:41 +02:00
Boris Ranto a402d0ab0e Rebase to latest upstream version (0.94.4)
The rtdsc patch got merged upstream and is already present in the release
2015-10-20 14:50:33 +02:00
Jonathan Wakely f07c72f3c4 Rebuilt for Boost 1.59 2015-10-20 14:50:23 +02:00
Boris Ranto b08d960589 Fix file list after rebase
Resolves: rhbz#1257374
2015-08-28 09:44:37 +02:00
Boris Ranto db6fdb3f16 Rebase to latest upstream version (0.94.3)
Resolves: rhbz#1257374
2015-08-27 14:29:43 +02:00
Richard W.M. Jones 99c1224b45 Fix build against boost 1.58 (http://tracker.ceph.com/issues/11576). 2015-08-27 14:29:37 +02:00
Dennis Gilmore b16dca6d95 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 2015-08-27 14:29:28 +02:00
David Tardon b8472782c8 rebuild for Boost 1.58 2015-08-27 14:29:12 +02:00
Boris Ranto 62e994c2c7 Rebase to latest upstream version (0.94.2)
Resolves: rhbz#1229924
2015-07-16 14:22:44 +02:00
Dennis Gilmore 155d784b79 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-07-16 14:22:36 +02:00
Dan Horák b19b3aa9da - fix build on s390(x) - no gperftools there 2015-06-08 17:43:38 +02:00
Boris Ranto b12af0ad46 Disable lttng support
Resolves: rhbz#1223319
2015-05-21 11:05:07 +02:00
Boris Ranto af0a1d434b Fix arm linking issue
Resolves: rhbz#1222286
2015-05-18 20:35:31 +02:00
Boris Ranto f5efd94d7b Fix arm compilation issues 2015-04-16 13:09:24 +02:00
Boris Ranto b1fc920eb9 Rebase to latest upstream (0.94.1) and sync-up spec file 2015-04-15 11:41:56 +02:00
Ken Dreyer 48fd62dda4 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-14 17:11:34 +02:00
Boris Ranto 085130783d 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:12:18 +01:00
Boris Ranto aece707d1a Rebase to 0.87.1 2015-03-02 13:22:46 +01:00
2 changed files with 1 additions and 43 deletions
-36
View File
@@ -1,36 +0,0 @@
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
+1 -7
View File
@@ -12,7 +12,7 @@
#################################################################################
Name: ceph
Version: 0.94.7
Release: 2%{?dist}
Release: 1%{?dist}
Epoch: 1
Summary: User space components of the Ceph file system
License: GPLv2
@@ -23,7 +23,6 @@ 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
@@ -431,7 +430,6 @@ python-cephfs instead.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
%endif
@@ -937,10 +935,6 @@ 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