rpm: remove major version from shared library devel pkg names

Fixes: http://tracker.ceph.com/issues/16345
Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 5857a1562c3de9b7374c3347d19b4639d46eb627..21fac1abad71e6760c56ed1d43d7025c3e923d92 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -358,13 +358,14 @@ developed as part of the Ceph distributed storage system. This is a
 shared library allowing applications to access the distributed object
 store using a simple file-like interface.
 
-%package -n librados2-devel
+%package -n librados-devel
 Summary:       RADOS headers
 Group:         Development/Libraries
 License:       LGPL-2.0
 Requires:      librados2 = %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-devel < %{epoch}:%{version}-%{release}
-%description -n librados2-devel
+Obsoletes:     librados2-devel
+%description -n librados-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS object store.
 
@@ -377,12 +378,13 @@ Requires: librados2 = %{epoch}:%{version}-%{release}
 This package provides a library implementation of the RADOS gateway
 (distributed object store with S3 and Swift personalities).
 
-%package -n librgw2-devel
+%package -n librgw-devel
 Summary:       RADOS gateway client library
 Group:         Development/Libraries
 License:       LGPL-2.0
 Requires:      librados2 = %{epoch}:%{version}-%{release}
-%description -n librgw2-devel
+Obsoletes:     librgw2-devel
+%description -n librgw-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS gateway client library.
 
@@ -406,14 +408,15 @@ Striping interface built on top of the rados library, allowing
 to stripe bigger objects onto several standard rados objects using
 an interface very similar to the rados one.
 
-%package -n libradosstriper1-devel
+%package -n libradosstriper-devel
 Summary:       RADOS striping interface headers
 Group:         Development/Libraries
 License:       LGPL-2.0
 Requires:      libradosstriper1 = %{epoch}:%{version}-%{release}
-Requires:      librados2-devel = %{epoch}:%{version}-%{release}
+Requires:      librados-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-devel < %{epoch}:%{version}-%{release}
-%description -n libradosstriper1-devel
+Obsoletes:     libradosstriper1-devel
+%description -n libradosstriper-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS striping interface.
 
@@ -431,14 +434,15 @@ RADOS, a reliable, autonomic distributed object storage cluster
 developed as part of the Ceph distributed storage system. This is a
 shared library allowing applications to manage these block devices.
 
-%package -n librbd1-devel
+%package -n librbd-devel
 Summary:       RADOS block device headers
 Group:         Development/Libraries
 License:       LGPL-2.0
 Requires:      librbd1 = %{epoch}:%{version}-%{release}
-Requires:      librados2-devel = %{epoch}:%{version}-%{release}
+Requires:      librados-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-devel < %{epoch}:%{version}-%{release}
-%description -n librbd1-devel
+Obsoletes:     librbd1-devel
+%description -n librbd-devel
 This package contains libraries and headers needed to develop programs
 that use RADOS block device.
 
@@ -467,14 +471,15 @@ performance, reliability, and scalability. This is a shared library
 allowing applications to access a Ceph distributed file system via a
 POSIX-like interface.
 
-%package -n libcephfs1-devel
+%package -n libcephfs-devel
 Summary:       Ceph distributed file system headers
 Group:         Development/Libraries
 License:       LGPL-2.0
 Requires:      libcephfs1 = %{epoch}:%{version}-%{release}
-Requires:      librados2-devel = %{epoch}:%{version}-%{release}
+Requires:      librados-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-devel < %{epoch}:%{version}-%{release}
-%description -n libcephfs1-devel
+Obsoletes:     libcephfs1-devel
+%description -n libcephfs-devel
 This package contains libraries and headers needed to develop programs
 that use Cephs distributed file system.
 
@@ -510,14 +515,15 @@ Requires: libcephfs1 = %{epoch}:%{version}-%{release}
 This package contains the Java Native Interface library for CephFS Java
 bindings.
 
-%package -n libcephfs_jni1-devel
+%package -n libcephfs_jni-devel
 Summary:       Development files for CephFS Java Native Interface library
 Group:         System Environment/Libraries
 License:       LGPL-2.0
 Requires:      java
 Requires:      libcephfs_jni1 = %{epoch}:%{version}-%{release}
 Obsoletes:     ceph-devel < %{epoch}:%{version}-%{release}
-%description -n libcephfs_jni1-devel
+Obsoletes:     libcephfs_jni1-devel
+%description -n libcephfs_jni-devel
 This package contains the development files for CephFS Java Native Interface
 library.
 
@@ -576,19 +582,19 @@ Summary:  Compatibility package for Ceph headers
 Group:         Development/Libraries
 License:       LGPL-2.0
 Obsoletes:     ceph-devel
-Requires:      librados2-devel = %{epoch}:%{version}-%{release}
-Requires:      libradosstriper1-devel = %{epoch}:%{version}-%{release}
-Requires:      librbd1-devel = %{epoch}:%{version}-%{release}
-Requires:      libcephfs1-devel = %{epoch}:%{version}-%{release}
+Requires:      librados-devel = %{epoch}:%{version}-%{release}
+Requires:      libradosstriper-devel = %{epoch}:%{version}-%{release}
+Requires:      librbd-devel = %{epoch}:%{version}-%{release}
+Requires:      libcephfs-devel = %{epoch}:%{version}-%{release}
 %if 0%{with cephfs_java}
-Requires:      libcephfs_jni1-devel = %{epoch}:%{version}-%{release}
+Requires:      libcephfs_jni-devel = %{epoch}:%{version}-%{release}
 %endif
 Provides:      ceph-devel
 %description devel-compat
 This is a compatibility package to accommodate ceph-devel split into
-librados2-devel, librbd1-devel and libcephfs1-devel. Packages still depending
-on ceph-devel should be fixed to depend on librados2-devel, librbd1-devel,
-libcephfs1-devel or libradosstriper1-devel instead.
+librados-devel, librbd-devel and libcephfs-devel. Packages still depending
+on ceph-devel should be fixed to depend on librados-devel, librbd-devel,
+libcephfs-devel or libradosstriper-devel instead.
 
 %package -n python-ceph-compat
 Summary:       Compatibility package for Cephs python libraries
@@ -1239,7 +1245,7 @@ fi
 /sbin/ldconfig
 
 #################################################################################
-%files -n librados2-devel
+%files -n librados-devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/rados
 %{_includedir}/rados/librados.h
@@ -1276,7 +1282,7 @@ fi
 /sbin/ldconfig
 
 #################################################################################
-%files -n libradosstriper1-devel
+%files -n libradosstriper-devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/radosstriper
 %{_includedir}/radosstriper/libradosstriper.h
@@ -1300,7 +1306,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 /sbin/ldconfig
 
 #################################################################################
-%files -n librbd1-devel
+%files -n librbd-devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/rbd
 %{_includedir}/rbd/librbd.h
@@ -1323,7 +1329,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 /sbin/ldconfig
 
 #################################################################################
-%files -n librgw2-devel
+%files -n librgw-devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/rados
 %{_includedir}/rados/librgw.h
@@ -1348,7 +1354,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 /sbin/ldconfig
 
 #################################################################################
-%files -n libcephfs1-devel
+%files -n libcephfs-devel
 %defattr(-,root,root,-)
 %dir %{_includedir}/cephfs
 %{_includedir}/cephfs/libcephfs.h
@@ -1410,7 +1416,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 /sbin/ldconfig
 
 #################################################################################
-%files -n libcephfs_jni1-devel
+%files -n libcephfs_jni-devel
 %defattr(-,root,root,-)
 %{_libdir}/libcephfs_jni.so