rpm: provide -devel library packages that are being obsoleted

This patch ensures that packages with the new name properly
replace old-named packages on upgrades.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 87b99d75df520d1cd31bed3383025e36288a0519..085f98884d2e01a41652bd43847437457399f3fc 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -364,7 +364,8 @@ Group:              Development/Libraries
 License:       LGPL-2.0
 Requires:      librados2 = %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-devel < %{epoch}:%{version}-%{release}
-Obsoletes:     librados2-devel
+Provides:      librados2-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     librados2-devel < %{epoch}:%{version}-%{release}
 %description -n librados-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS object store.
@@ -384,7 +385,8 @@ Group:              Development/Libraries
 License:       LGPL-2.0
 Requires:      librados-devel = %{epoch}:%{version}-%{release}
 Requires:      librgw2 = %{epoch}:%{version}-%{release}
-Obsoletes:     librgw2-devel
+Provides:      librgw2-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     librgw2-devel < %{epoch}:%{version}-%{release}
 %description -n librgw-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS gateway client library.
@@ -416,7 +418,8 @@ License:    LGPL-2.0
 Requires:      libradosstriper1 = %{epoch}:%{version}-%{release}
 Requires:      librados-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-devel < %{epoch}:%{version}-%{release}
-Obsoletes:     libradosstriper1-devel
+Provides:      libradosstriper1-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     libradosstriper1-devel < %{epoch}:%{version}-%{release}
 %description -n libradosstriper-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS striping interface.
@@ -442,7 +445,8 @@ License:    LGPL-2.0
 Requires:      librbd1 = %{epoch}:%{version}-%{release}
 Requires:      librados-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-devel < %{epoch}:%{version}-%{release}
-Obsoletes:     librbd1-devel
+Provides:      librbd1-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     librbd1-devel < %{epoch}:%{version}-%{release}
 %description -n librbd-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS block device.
@@ -479,7 +483,8 @@ License:    LGPL-2.0
 Requires:      libcephfs1 = %{epoch}:%{version}-%{release}
 Requires:      librados-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-devel < %{epoch}:%{version}-%{release}
-Obsoletes:     libcephfs1-devel
+Provides:      libcephfs1-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     libcephfs1-devel < %{epoch}:%{version}-%{release}
 %description -n libcephfs-devel
 This package contains libraries and headers needed to develop programs
 that use Cephs distributed file system.
@@ -523,7 +528,8 @@ License:    LGPL-2.0
 Requires:      java
 Requires:      libcephfs_jni1 = %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-devel < %{epoch}:%{version}-%{release}
-Obsoletes:     libcephfs_jni1-devel
+Provides:      libcephfs_jni1-devel = %{epoch}:%{version}-%{release}
+Obsoletes:     libcephfs_jni1-devel < %{epoch}:%{version}-%{release}
 %description -n libcephfs_jni-devel
 This package contains the development files for CephFS Java Native Interface
 library.