From 81fb12c578ffd876acce50791509c11b12c641de Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Mar 31 2021 20:41:15 +0000 Subject: ceph-16.2.0 GA --- diff --git a/.ceph.metadata b/.ceph.metadata index 9feb3a1..56ea628 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1 +1 @@ -d5ca6a096d550e7a91c68518d7006f7f72bd1f0d SOURCES/ceph-16.1.0.tar.bz2 +f8cc85e4cc519d7e469a0c3c8327bd1675f0b287 SOURCES/ceph-16.2.0.tar.gz diff --git a/README.md b/README.md index 94bbe55..23f7954 100644 --- a/README.md +++ b/README.md @@ -22,5 +22,5 @@ Create a src.rpm with: To build: - $ cbs build [--scratch] storage8-ceph-pacific-el8 ceph-16.1.0-2.el8.src.rpm + $ cbs build [--scratch] storage8-ceph-pacific-el8 ceph-16.2.0-1.el8.src.rpm diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index bc308d4..90ad53f 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -34,13 +34,13 @@ %if 0%{?fedora} || 0%{?rhel} %bcond_without selinux %ifarch x86_64 -%global _system_pmdk 1 %bcond_without rbd_rwl_cache %bcond_without rbd_ssd_cache +%global _system_pmdk 1 %else -%global _system_pmdk 0 %bcond_with rbd_rwl_cache %bcond_with rbd_ssd_cache +%global _system_pmdk 0 %endif %if 0%{?rhel} >= 8 %bcond_with cephfs_java @@ -125,8 +125,8 @@ # main package definition ################################################################################# Name: ceph -Version: 16.1.0 -Release: 2%{?dist} +Version: 16.2.0 +Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -142,9 +142,7 @@ License: (LGPLv2.1 or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost-1.0 and BSD a Group: System/Filesystems %endif URL: http://ceph.com/ -#Source0: %%{?_remote_tarball_prefix}ceph-%%{version}.tar.gz -# https://download.ceph.com/rpm-16.1.0/el8/SRPMS/... -Source0: ceph-16.1.0.tar.bz2 +Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.gz Patch0001: 0001-src-common-crc32c_intel_fast.patch Patch0002: 0002-src-common-CMakeLists.txt.patch Patch0003: 0003-src-common-bitstr.h.patch @@ -217,6 +215,7 @@ BuildRequires: libtool BuildRequires: libxml2-devel BuildRequires: make BuildRequires: ncurses-devel +BuildRequires: libicu-devel BuildRequires: parted BuildRequires: patch BuildRequires: perl @@ -225,6 +224,7 @@ BuildRequires: procps BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: snappy-devel +BuildRequires: sqlite-devel BuildRequires: sudo BuildRequires: pkgconfig(udev) BuildRequires: util-linux @@ -272,8 +272,8 @@ BuildRequires: libevent-devel BuildRequires: yaml-cpp-devel %endif %if 0%{?_system_pmdk} -BuildRequires: libpmem-devel -BuildRequires: libpmemobj-devel +BuildRequires: libpmem-devel +BuildRequires: libpmemobj-devel %endif %if 0%{with seastar} BuildRequires: c-ares-devel @@ -548,6 +548,7 @@ Group: System/Filesystems %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: ceph-mgr-modules-core = %{_epoch_prefix}%{version}-%{release} +Requires: libcephsqlite = %{_epoch_prefix}%{version}-%{release} %if 0%{?weak_deps} Recommends: ceph-mgr-dashboard = %{_epoch_prefix}%{version}-%{release} Recommends: ceph-mgr-diskprediction-local = %{_epoch_prefix}%{version}-%{release} @@ -915,6 +916,32 @@ Obsoletes: python-rados < %{_epoch_prefix}%{version}-%{release} This package contains Python 3 libraries for interacting with Ceph RADOS object store. +%package -n libcephsqlite +Summary: SQLite3 VFS for Ceph +%if 0%{?suse_version} +Group: System/Libraries +%endif +Requires: librados2 = %{_epoch_prefix}%{version}-%{release} +%description -n libcephsqlite +A SQLite3 VFS for storing and manipulating databases stored on Ceph's RADOS +distributed object store. + +%package -n libcephsqlite-devel +Summary: SQLite3 VFS for Ceph headers +%if 0%{?suse_version} +Group: Development/Libraries/C and C++ +%endif +Requires: sqlite-devel +Requires: libcephsqlite = %{_epoch_prefix}%{version}-%{release} +Requires: librados-devel = %{_epoch_prefix}%{version}-%{release} +Requires: libradospp-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: ceph-devel < %{_epoch_prefix}%{version}-%{release} +Provides: libcephsqlite-devel = %{_epoch_prefix}%{version}-%{release} +Obsoletes: libcephsqlite-devel < %{_epoch_prefix}%{version}-%{release} +%description -n libcephsqlite-devel +A SQLite3 VFS for storing and manipulating databases stored on Ceph's RADOS +distributed object store. + %if 0%{with libradosstriper} %package -n libradosstriper1 Summary: RADOS striping interface @@ -1404,7 +1431,7 @@ touch %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys chmod 0600 %{buildroot}%{_sharedstatedir}/cephadm/.ssh/authorized_keys # firewall templates and /sbin/mount.ceph symlink -%if 0%{?suse_version} +%if 0%{?suse_version} && !0%{?usrmerged} mkdir -p %{buildroot}/sbin ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph %endif @@ -1577,7 +1604,7 @@ exit 0 %{_bindir}/rbd-replay-many %{_bindir}/rbdmap %{_sbindir}/mount.ceph -%if 0%{?suse_version} +%if 0%{?suse_version} && !0%{?usrmerged} /sbin/mount.ceph %endif %if %{with lttng} @@ -2188,6 +2215,16 @@ fi %{python3_sitearch}/rados.cpython*.so %{python3_sitearch}/rados-*.egg-info +%files -n libcephsqlite +%{_libdir}/libcephsqlite.so + +%post -n libcephsqlite -p /sbin/ldconfig + +%postun -n libcephsqlite -p /sbin/ldconfig + +%files -n libcephsqlite-devel +%{_includedir}/libcephsqlite.h + %if 0%{with libradosstriper} %files -n libradosstriper1 %{_libdir}/libradosstriper.so.* @@ -2461,6 +2498,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Wed Mar 31 2021 Kaleb S. KEITHLEY - 2:16.2.0-1 +- 16.2.0 GA + * Sat Mar 27 2021 Kaleb S. KEITHLEY - 2:16.1.0-2 - 16.1.0 RC, misc python3-* -> python-*