SHA256
1
0
forked from pool/ceph

Update link from rev 23 to rev 26

OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=37
This commit is contained in:
Nathan Cutler 2016-06-16 21:55:17 +00:00 committed by Git OBS Bridge
parent 2c6de43198
commit 86c1af0a8d
6 changed files with 64 additions and 101 deletions

View File

@ -1,6 +1,6 @@
<services> <services>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="versionformat">10.2.1+git.%ct.%h</param> <param name="versionformat">10.2.2+git.%ct.%h</param>
<param name="url">git://github.com/SUSE/ceph.git</param> <param name="url">git://github.com/SUSE/ceph.git</param>
<param name="revision">ses3</param> <param name="revision">ses3</param>
<param name="filename">ceph</param> <param name="filename">ceph</param>

View File

@ -1,5 +1,5 @@
<servicedata> <servicedata>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">git://github.com/SUSE/ceph.git</param> <param name="url">git://github.com/SUSE/ceph.git</param>
<param name="changesrevision">1b99e11e37dcd9a2df1b8631e925ece9a4ed4ec1</param></service> <param name="changesrevision">b5a7c563cc3561d25db573bd85e20fb255715896</param></service>
</servicedata> </servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:31f06793633334af503a8096966d4ce5c95ed2323493e8d4c389d6b263da7a16
size 16506061

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4d68e347c165173604a97766b76efc19d70edcdaa6f5952fc9ff7690d7fcf69
size 16499656

View File

@ -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 Mon Jun 13 16:02:43 UTC 2016 - ncutler@suse.com

126
ceph.spec
View File

@ -16,7 +16,6 @@
%bcond_with tests %bcond_with tests
%bcond_with xio %bcond_with xio
%bcond_without tcmalloc %bcond_without tcmalloc
%bcond_without libs_compat
%bcond_with lowmem_builder %bcond_with lowmem_builder
%bcond_with minimal_debugging_information %bcond_with minimal_debugging_information
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
@ -54,7 +53,7 @@
# common # common
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 10.2.1+git.1465817005.1b99e11 Version: 10.2.2+git.1466113786.b5a7c56
Release: 0 Release: 0
Summary: User space components of the Ceph file system 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 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 shared library allowing applications to access the distributed object
store using a simple file-like interface. store using a simple file-like interface.
%package -n librados2-devel %package -n librados-devel
Summary: RADOS headers Summary: RADOS headers
Group: Development/Libraries Group: Development/Libraries
License: LGPL-2.0 License: LGPL-2.0
Requires: librados2 = %{version}-%{release} Requires: librados2 = %{version}-%{release}
Obsoletes: ceph-devel < %{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 This package contains libraries and headers needed to develop programs
that use RADOS object store. that use RADOS object store.
@ -387,12 +387,14 @@ Requires: librados2 = %{version}-%{release}
This package provides a library implementation of the RADOS gateway This package provides a library implementation of the RADOS gateway
(distributed object store with S3 and Swift personalities). (distributed object store with S3 and Swift personalities).
%package -n librgw2-devel %package -n librgw-devel
Summary: RADOS gateway client library Summary: RADOS gateway client library
Group: Development/Libraries Group: Development/Libraries
License: LGPL-2.0 License: LGPL-2.0
Requires: librados2 = %{version}-%{release} Requires: librados-devel = %{version}-%{release}
%description -n librgw2-devel Requires: librgw2 = %{version}-%{release}
Obsoletes: librgw2-devel
%description -n librgw-devel
This package contains libraries and headers needed to develop programs This package contains libraries and headers needed to develop programs
that use RADOS gateway client library. 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 to stripe bigger objects onto several standard rados objects using
an interface very similar to the rados one. an interface very similar to the rados one.
%package -n libradosstriper1-devel %package -n libradosstriper-devel
Summary: RADOS striping interface headers Summary: RADOS striping interface headers
Group: Development/Libraries Group: Development/Libraries
License: LGPL-2.0 License: LGPL-2.0
Requires: libradosstriper1 = %{version}-%{release} Requires: libradosstriper1 = %{version}-%{release}
Requires: librados2-devel = %{version}-%{release} Requires: librados-devel = %{version}-%{release}
Obsoletes: ceph-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 This package contains libraries and headers needed to develop programs
that use RADOS striping interface. 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 developed as part of the Ceph distributed storage system. This is a
shared library allowing applications to manage these block devices. shared library allowing applications to manage these block devices.
%package -n librbd1-devel %package -n librbd-devel
Summary: RADOS block device headers Summary: RADOS block device headers
Group: Development/Libraries Group: Development/Libraries
License: LGPL-2.0 License: LGPL-2.0
Requires: librbd1 = %{version}-%{release} Requires: librbd1 = %{version}-%{release}
Requires: librados2-devel = %{version}-%{release} Requires: librados-devel = %{version}-%{release}
Obsoletes: ceph-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 This package contains libraries and headers needed to develop programs
that use RADOS block device. 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 allowing applications to access a Ceph distributed file system via a
POSIX-like interface. POSIX-like interface.
%package -n libcephfs1-devel %package -n libcephfs-devel
Summary: Ceph distributed file system headers Summary: Ceph distributed file system headers
Group: Development/Libraries Group: Development/Libraries
License: LGPL-2.0 License: LGPL-2.0
Requires: libcephfs1 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release}
Requires: librados2-devel = %{version}-%{release} Requires: librados-devel = %{version}-%{release}
Obsoletes: ceph-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 This package contains libraries and headers needed to develop programs
that use Cephs distributed file system. 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 This package contains the Java Native Interface library for CephFS Java
bindings. bindings.
%package -n libcephfs_jni1-devel %package -n libcephfs_jni-devel
Summary: Development files for CephFS Java Native Interface library Summary: Development files for CephFS Java Native Interface library
Group: System Environment/Libraries Group: System Environment/Libraries
License: LGPL-2.0 License: LGPL-2.0
Requires: java Requires: java
Requires: libcephfs_jni1 = %{version}-%{release} Requires: libcephfs_jni1 = %{version}-%{release}
Obsoletes: ceph-devel < %{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 This package contains the development files for CephFS Java Native Interface
library. library.
@ -560,61 +566,6 @@ populated file-systems.
%endif %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 # common
################################################################################# #################################################################################
@ -1261,7 +1212,7 @@ fi
/sbin/ldconfig /sbin/ldconfig
################################################################################# #################################################################################
%files -n librados2-devel %files -n librados-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_includedir}/rados %dir %{_includedir}/rados
%{_includedir}/rados/librados.h %{_includedir}/rados/librados.h
@ -1298,7 +1249,7 @@ fi
/sbin/ldconfig /sbin/ldconfig
################################################################################# #################################################################################
%files -n libradosstriper1-devel %files -n libradosstriper-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_includedir}/radosstriper %dir %{_includedir}/radosstriper
%{_includedir}/radosstriper/libradosstriper.h %{_includedir}/radosstriper/libradosstriper.h
@ -1322,7 +1273,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
/sbin/ldconfig /sbin/ldconfig
################################################################################# #################################################################################
%files -n librbd1-devel %files -n librbd-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_includedir}/rbd %dir %{_includedir}/rbd
%{_includedir}/rbd/librbd.h %{_includedir}/rbd/librbd.h
@ -1345,7 +1296,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
/sbin/ldconfig /sbin/ldconfig
################################################################################# #################################################################################
%files -n librgw2-devel %files -n librgw-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_includedir}/rados %dir %{_includedir}/rados
%{_includedir}/rados/librgw.h %{_includedir}/rados/librgw.h
@ -1370,7 +1321,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
/sbin/ldconfig /sbin/ldconfig
################################################################################# #################################################################################
%files -n libcephfs1-devel %files -n libcephfs-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_includedir}/cephfs %dir %{_includedir}/cephfs
%{_includedir}/cephfs/libcephfs.h %{_includedir}/cephfs/libcephfs.h
@ -1433,7 +1384,7 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
/sbin/ldconfig /sbin/ldconfig
################################################################################# #################################################################################
%files -n libcephfs_jni1-devel %files -n libcephfs_jni-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libcephfs_jni.so %{_libdir}/libcephfs_jni.so
@ -1532,22 +1483,5 @@ exit 0
%endif # with selinux %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 %changelog