diff --git a/_service b/_service index 7b8a86a..48f27b4 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - 10.2.1+git.%ct.%h + 10.2.2+git.%ct.%h git://github.com/SUSE/ceph.git ses3 ceph diff --git a/_servicedata b/_servicedata index e630895..5ac11a2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ git://github.com/SUSE/ceph.git - 1b99e11e37dcd9a2df1b8631e925ece9a4ed4ec1 + b5a7c563cc3561d25db573bd85e20fb255715896 \ No newline at end of file diff --git a/ceph-10.2.1+git.1465817005.1b99e11.tar.bz2 b/ceph-10.2.1+git.1465817005.1b99e11.tar.bz2 deleted file mode 100644 index 1a56473..0000000 --- a/ceph-10.2.1+git.1465817005.1b99e11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31f06793633334af503a8096966d4ce5c95ed2323493e8d4c389d6b263da7a16 -size 16506061 diff --git a/ceph-10.2.2+git.1466113786.b5a7c56.tar.bz2 b/ceph-10.2.2+git.1466113786.b5a7c56.tar.bz2 new file mode 100644 index 0000000..99104f3 --- /dev/null +++ b/ceph-10.2.2+git.1466113786.b5a7c56.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4d68e347c165173604a97766b76efc19d70edcdaa6f5952fc9ff7690d7fcf69 +size 16499656 diff --git a/ceph.changes b/ceph.changes index e87cd22..8fed5a9 100644 --- a/ceph.changes +++ b/ceph.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Thu Jun 16 21:52:13 UTC 2016 - ncutler@suse.com + +- Update to version 10.2.2+git.1466113786.b5a7c56: + + rpm: remove major version from shared library devel pkg names + + rpm: align librgw-devel dependencies with debian packaging + + rpm: drop obsolete devel-compat meta package + + rpm: drop obsolete libs-compat metapackage + + rpm: drop obsolete python-ceph-compat metapackage + +------------------------------------------------------------------- +Thu Jun 16 09:21:22 UTC 2016 - ncutler@suse.com + +- Update to upstream 10.2.2: + + mds: order directories by hash and fix simultaneous readdir races (pr#9655, + issue#16251, issue#16284) + + client: fix bugs accidentally disabling readahead (pr#9656, issue#16252) + + qa/workunits: ensure replay has started before checking position (pr#9674, + issue#16267) + + rbd-mirror: do not re-use image id from mirror directory if creating image + (pr#9673, issue#16265) + + librbd: recursive lock possible when disabling journaling (pr#9654, + issue#16246) + + rbd-mirror: FAILED assert(!m_status_watcher) (pr#9690, issue#16290) + + librbd: do not shut down exclusive lock while acquiring (pr#9691, + issue#16291) + + librbd: remove should ignore mirror errors from older OSDs (pr#9692, + issue#16292) + ------------------------------------------------------------------- Mon Jun 13 16:02:43 UTC 2016 - ncutler@suse.com diff --git a/ceph.spec b/ceph.spec index 3900cca..8520821 100644 --- a/ceph.spec +++ b/ceph.spec @@ -16,7 +16,6 @@ %bcond_with tests %bcond_with xio %bcond_without tcmalloc -%bcond_without libs_compat %bcond_with lowmem_builder %bcond_with minimal_debugging_information %if 0%{?fedora} || 0%{?rhel} @@ -54,7 +53,7 @@ # common ################################################################################# Name: ceph -Version: 10.2.1+git.1465817005.1b99e11 +Version: 10.2.2+git.1466113786.b5a7c56 Release: 0 Summary: User space components of the Ceph file system License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT @@ -368,13 +367,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 = %{version}-%{release} Obsoletes: ceph-devel < %{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. @@ -387,12 +387,14 @@ Requires: librados2 = %{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 = %{version}-%{release} -%description -n librgw2-devel +Requires: librados-devel = %{version}-%{release} +Requires: librgw2 = %{version}-%{release} +Obsoletes: librgw2-devel +%description -n librgw-devel This package contains libraries and headers needed to develop programs that use RADOS gateway client library. @@ -416,14 +418,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 = %{version}-%{release} -Requires: librados2-devel = %{version}-%{release} +Requires: librados-devel = %{version}-%{release} Obsoletes: ceph-devel < %{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. @@ -441,14 +444,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 = %{version}-%{release} -Requires: librados2-devel = %{version}-%{release} +Requires: librados-devel = %{version}-%{release} Obsoletes: ceph-devel < %{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. @@ -477,14 +481,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 = %{version}-%{release} -Requires: librados2-devel = %{version}-%{release} +Requires: librados-devel = %{version}-%{release} Obsoletes: ceph-devel < %{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. @@ -520,14 +525,15 @@ Requires: libcephfs1 = %{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 = %{version}-%{release} Obsoletes: ceph-devel < %{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. @@ -560,61 +566,6 @@ populated file-systems. %endif -%if 0%{with libs_compat} - -%package libs-compat -Summary: Meta package to include ceph libraries -Group: System Environment/Libraries -License: LGPL-2.0 -Obsoletes: ceph-libs -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. - -%endif - -%package devel-compat -Summary: Compatibility package for Ceph headers -Group: Development/Libraries -License: LGPL-2.0 -Obsoletes: ceph-devel -Requires: librados2-devel = %{version}-%{release} -Requires: libradosstriper1-devel = %{version}-%{release} -Requires: librbd1-devel = %{version}-%{release} -Requires: libcephfs1-devel = %{version}-%{release} -%if 0%{with cephfs_java} -Requires: libcephfs_jni1-devel = %{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. - -%package -n python-ceph-compat -Summary: Compatibility package for Cephs python libraries -Group: System Environment/Libraries -License: LGPL-2.0 -Obsoletes: python-ceph -Requires: python-rados = %{version}-%{release} -Requires: python-rbd = %{version}-%{release} -Requires: python-cephfs = %{version}-%{release} -Provides: python-ceph -%description -n python-ceph-compat -This is a compatibility package to accommodate python-ceph split into -python-rados, python-rbd and python-cephfs. Packages still depending on -python-ceph should be fixed to depend on python-rados, python-rbd or -python-cephfs instead. - ################################################################################# # common ################################################################################# @@ -1261,7 +1212,7 @@ fi /sbin/ldconfig ################################################################################# -%files -n librados2-devel +%files -n librados-devel %defattr(-,root,root,-) %dir %{_includedir}/rados %{_includedir}/rados/librados.h @@ -1298,7 +1249,7 @@ fi /sbin/ldconfig ################################################################################# -%files -n libradosstriper1-devel +%files -n libradosstriper-devel %defattr(-,root,root,-) %dir %{_includedir}/radosstriper %{_includedir}/radosstriper/libradosstriper.h @@ -1322,7 +1273,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 @@ -1345,7 +1296,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 @@ -1370,7 +1321,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 @@ -1433,7 +1384,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 @@ -1532,22 +1483,5 @@ exit 0 %endif # with selinux -################################################################################# -%if 0%{with libs_compat} -%files libs-compat -# We need an empty %%files list for ceph-libs-compat, to tell rpmbuild to actually -# build this meta package. -%endif - -################################################################################# -%files devel-compat -# We need an empty %%files list for ceph-devel-compat, to tell rpmbuild to -# actually build this meta package. - -################################################################################# -%files -n python-ceph-compat -# We need an empty %%files list for python-ceph-compat, to tell rpmbuild to -# actually build this meta package. - %changelog