From 97df8b03c12d739d3cff1b4554b4d193b2796f54 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 28 Nov 2018 15:15:06 +0100 Subject: [PATCH] build/ops: rpm: make ceph-common provide/obsolete libradosstriper1 The purpose of this commit is to address package conflict issues with the luminous->nautilus upgrade. Signed-off-by: Nathan Cutler --- ceph.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index 041a0f4803cd5..0cc39e8e6c901 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -482,7 +482,10 @@ Requires: python%{python3_pkgversion}-prettytable Requires: python%{python3_pkgversion}-PrettyTable %endif %if 0%{with libradosstriper} -Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} +Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} +%else +Provides: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} +Obsoletes: libradosstriper1 <= %{_epoch_prefix}%{version}-%{release} %endif %{?systemd_requires} %if 0%{?suse_version} -- 2.39.5