From eefc62e3b85f402a7e1ae31c272c8a432d979379 Mon Sep 17 00:00:00 2001 From: Erik Logtenberg Date: Thu, 31 Jul 2014 23:49:56 +0200 Subject: [PATCH] ceph.spec.in: add ceph-libs-compat Added a ceph-libs-compat package in accordance with Fedora packaging guidelines [1], to handle the recent package split more gracefully. In Fedora this is necessary because there are already other packages depending on ceph-libs, that need to be adjusted to depend on the new split packages instead. In the mean time, ceph-libs-compat prevents breakage. [1] http://fedoraproject.org/wiki/Upgrade_paths_%E2%80%94_renaming_or_splitting_packages Signed-off-by: Erik Logtenberg (cherry picked from commit 6c264f2204cbd54d90b02101e40ac9aa5aa72d7c) Conflicts: ceph.spec.in --- ceph.spec.in | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 7ceb490c6c0c4..c4ae1b69e3042 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -174,8 +174,8 @@ managers such as Pacemaker. Summary: RADOS distributed object store client library Group: System Environment/Libraries License: LGPL-2.0 -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} -Obsoletes: ceph-libs +%if 0%{?rhel} || 0%{?centos_version} || 0%{?fedora} +Obsoletes: ceph-libs < 0.80.5 %endif %description -n librados2 RADOS is a reliable, autonomic distributed object storage cluster @@ -189,7 +189,7 @@ Group: System Environment/Libraries License: LGPL-2.0 Requires: librados2 = %{version}-%{release} %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} -Obsoletes: ceph-libs +Obsoletes: ceph-libs < 0.80.5 %endif %description -n librbd1 RBD is a block device striped across multiple distributed objects in @@ -201,8 +201,8 @@ shared library allowing applications to manage these block devices. Summary: Ceph distributed file system client library Group: System Environment/Libraries License: LGPL-2.0 -%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora} -Obsoletes: ceph-libs +%if 0%{?rhel} || 0%{?centos_version} || 0%{?fedora} +Obsoletes: ceph-libs < 0.80.5 %endif %description -n libcephfs1 Ceph is a distributed network file system designed to provide excellent @@ -264,6 +264,23 @@ BuildRequires: junit4 %description -n cephfs-java This package contains the Java libraries for the Ceph File System. +%package libs-compat +Summary: Meta package to include ceph libraries. +Group: System Environment/Libraries +License: LGPL-2.0 +Obsoletes: ceph-libs < 0.80.5 +Requires: librados2 = %{version}-%{release} +Requires: librbd1 = %{version}-%{release} +Requires: libcephfs1 = %{version}-%{release} +Provides: ceph-libs + +%description libs-compat +This is a meta package, that pulls in librados2, librbd1 and libcephfs1. It +is included for backwards compatibility with distributions that depend on the +former ceph-libs package, which is now split up into these three subpackages. +Packages still depending on ceph-libs should be fixed to depend on librados2, +librbd1 or libcephfs1 instead. + %if 0%{?opensuse} || 0%{?suse_version} %debug_package %endif @@ -702,4 +719,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1 %{_javadir}/libcephfs.jar %{_javadir}/libcephfs-test.jar +%files libs-compat + %changelog -- 2.39.5