Compare commits

..

24 Commits

Author SHA1 Message Date
Kaleb S. KEITHLEY 1a49ee3c38 outdated version, obsoleted by packages in CentOS Storage SIG 2017-09-27 09:00:36 -04:00
Kaleb S. KEITHLEY 58456ef90e add README.deprecated, prepare for retirement in epel 2017-08-26 06:53:53 -04:00
Kaleb S. KEITHLEY 7381689411 add provides for -devel packages 2017-08-18 09:22:26 -04:00
Boris Ranto dc6776ed68 add provides for -devel packages 2016-12-08 21:40:47 +01:00
Boris Ranto 4f098bea06 only remove the {librados2,librbd1}-devel and python-{rados,rbd} on x86_64
- resolves: rhbz#1299820
2016-02-24 00:39:17 +01:00
Boris Ranto c31627732a Remove python-rados and python-rbd packages to avoid package conflicts
These two cause issues when you try to install ceph-devel with upstream
repos + epel enabled.
2015-10-27 17:13:12 +01:00
Boris Ranto 8986c308e9 Remove python-rados and python-rbd packages to avoid package conflicts
See http://tracker.ceph.com/issues/11104#change-59701 for details.
2015-10-06 23:10:05 +02:00
Ken Dreyer c9a91bad2f 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 EPEL
(0.80.7-0.4), but newer than what we shipped in the last EPEL update
(0.80.5).
2015-04-01 09:06:55 -06:00
Boris Ranto 0d466b4dd8 Remove release from version comparison strings to allow cooperation with base rhel packages 2015-01-20 21:52:07 +01:00
Boris Ranto 15c95d8f23 Revert "Deprecate the package"
This reverts commit 50eb9a7e7b.
Based on high demand, we have decided to keep shipping ceph
in epel 7.
2015-01-20 18:08:19 +01:00
Boris Ranto 2c3bf8c826 Revert "Fix up obsoletes"
This reverts commit 2b75f339d3.
Based on high demand, we have decided to keep shipping ceph
in epel 7.
2015-01-20 17:54:43 +01:00
Boris Ranto 2b75f339d3 Fix up obsoletes 2015-01-19 11:40:08 +01:00
Boris Ranto 50eb9a7e7b Deprecate the package
The client part of the package will be provided in rhel 7.1.
Keep a virtual ceph package to allow clean update for 7.0 as
well as 7.1 users.
2015-01-16 15:17:37 +01:00
Pádraig Brady 120ad0de01 Merge branch 'f21' into epel7
Conflicts:
	ceph.spec
	sources
2015-01-14 19:19:41 +00:00
Dan Horák e6a39bd1e3 - update Requires for s390(x) 2014-09-09 10:17:46 +02:00
Boris Ranto 92888198f8 Fix bz 1136811 (incorrect symlink on fedora) 2014-09-03 15:37:55 +02:00
Boris Ranto dd9644bc02 Second attempt to fix selinux issue (bz 1118504) 2014-08-22 02:05:10 +02:00
Kalev Lember 25b47f32a9 Obsolete ceph-libcephfs
Correct the name of the obsoleted package. It used to be called
"ceph-libcephfs" and not "libcephfs".

Transaction check error:
file /usr/lib64/libcephfs.so.1.0.0 from install of
libcephfs1-1:0.80.5-5.fc21.x86_64 conflicts with file from package
ceph-libcephfs-0.81.0-6.fc21.x86_64
2014-08-16 23:38:39 +02:00
Boris Ranto e44806fede Various fixes:
- Do not require xfsprogs/xfsprogs-devel for el6
- Require gperftools-devel for non-ppc*/s390* architectures only
- Do not require junit -- no need to build libcephfs-test.jar
- Build without libxfs for el6
- Build without tcmalloc for ppc*/s390* architectures
- Location of mkcephfs must depend on a rhel release
- Use epoch in the Requires fields [1130700]
2014-08-16 16:00:20 +02:00
Boris Ranto 830e99f484 Use the proper version name in Obsoletes, the previous one did not obsolete all the packages that it should 2014-08-16 10:32:16 +02:00
Boris Ranto a236dbbbe2 Fix the date in changelog 2014-08-16 03:50:05 +02:00
Peter Robinson c81d313d7c - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-15 23:54:45 +00:00
Boris Ranto 5311ad2942 Add the arm pthread hack 2014-08-16 01:11:30 +02:00
Boris Ranto 08b7207d61 Bump the Epoch, we need to keep the latest stable, not development, ceph version in fedora
- Use the upstream spec file with the ceph-libs split
- Add libs-compat subpackage
- Use fedora in rhel 7 checks
- Obsolete libcephfs
- Depend on redhat-lsb-core for the initscript
2014-08-15 23:07:34 +02:00
7 changed files with 1 additions and 1266 deletions
-2
View File
@@ -1,2 +0,0 @@
ceph-*.tar.*
*.src.rpm
@@ -1,27 +0,0 @@
From 6c280200b42758d3e84cfd1a5b256171cab132d1 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Wed, 14 Jan 2015 07:46:56 +0100
Subject: [PATCH 1/3] gperftools deprecated google/* includes
---
src/perfglue/heap_profiler.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc
index 6b079b8..cdd5ccb 100644
--- a/src/perfglue/heap_profiler.cc
+++ b/src/perfglue/heap_profiler.cc
@@ -12,8 +12,8 @@
*
*/
-#include <google/heap-profiler.h>
-#include <google/malloc_extension.h>
+#include <gperftools/heap-profiler.h>
+#include <gperftools/malloc_extension.h>
#include "heap_profiler.h"
#include "common/environment.h"
#include "common/LogClient.h"
--
1.9.3
@@ -1,25 +0,0 @@
From 213613337d56bf1b1257f043c7b737ee86b0e1be Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Wed, 14 Jan 2015 07:47:47 +0100
Subject: [PATCH 2/3] -Wno-format causes compiler options collision
---
src/test/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 69f9e84..9ede275 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -646,7 +646,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
if LINUX
ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
endif
--
1.9.3
@@ -1,27 +0,0 @@
From 149481ac6dc52a852fb53800384a99e3d69ad11a Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Mon, 8 Dec 2014 08:36:37 +0100
Subject: [PATCH 3/3] Backport pull request #2937 to firefly
---
src/common/RWLock.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/common/RWLock.h b/src/common/RWLock.h
index f901ac0..f4d1937 100644
--- a/src/common/RWLock.h
+++ b/src/common/RWLock.h
@@ -36,7 +36,9 @@ public:
}
virtual ~RWLock() {
- pthread_rwlock_unlock(&L);
+ // The following check is racy but we are about to destroy
+ // the object and we assume that there are no other users.
+ //assert(!is_locked()); -- hacky backport, no is_locked in firefly
pthread_rwlock_destroy(&L);
}
--
1.9.3
-1184
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -0,0 +1 @@
outdated version, obsoleted by packages in CentOS Storage SIG
-1
View File
@@ -1 +0,0 @@
0bb1d511f39d648035c412c41fd5b8a5 ceph-0.80.10.tar.bz2