From 5e76bc0ad42c1edeca4063efdcb12b4e8316f8af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 11 Jul 2023 23:26:31 +0200 Subject: [PATCH 1/4] Rebuilt for ICU 73.2 --- ceph.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 2b820d1..16269b0 100644 --- a/ceph.spec +++ b/ceph.spec @@ -173,7 +173,7 @@ ################################################################################# Name: ceph Version: 18.1.2 -Release: 0.2%{?dist} +Release: 0.3%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -2633,6 +2633,9 @@ exit 0 %{_datadir}/snmp/mibs %changelog +* Tue Jul 11 2023 František Zatloukal - 2:18.1.2-0.3 +- Rebuilt for ICU 73.2 + * Fri Jun 30 2023 Kaleb S. KEITHLEY - 2:18.1.2-0.2 - Rebuilt for Python 3.12 From 0d1cc731ad2e553b3fe86a92dc4d66e3d244ec3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 15:29:34 +0000 Subject: [PATCH 2/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ceph.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 16269b0..41500d9 100644 --- a/ceph.spec +++ b/ceph.spec @@ -173,7 +173,7 @@ ################################################################################# Name: ceph Version: 18.1.2 -Release: 0.3%{?dist} +Release: 0.4%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -2633,6 +2633,9 @@ exit 0 %{_datadir}/snmp/mibs %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2:18.1.2-0.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 František Zatloukal - 2:18.1.2-0.3 - Rebuilt for ICU 73.2 From 6f79abf9c3ca6c56d2b5c3c5894c98fc7d8a3f7b Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 20 Jul 2023 18:05:16 -0400 Subject: [PATCH 3/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild with python3-Cython -> python3dist(cython) < 3~~ Signed-off-by: Kaleb S. KEITHLEY --- ceph.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 41500d9..282a09c 100644 --- a/ceph.spec +++ b/ceph.spec @@ -299,7 +299,7 @@ BuildRequires: procps BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-Cython +BuildRequires: python3dist(cython) < 3~~ BuildRequires: snappy-devel BuildRequires: sqlite-devel BuildRequires: sudo @@ -2633,8 +2633,10 @@ exit 0 %{_datadir}/snmp/mibs %changelog + * Wed Jul 19 2023 Fedora Release Engineering - 2:18.1.2-0.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild +- with python3-Cython -> python3dist(cython) < 3~~ * Tue Jul 11 2023 František Zatloukal - 2:18.1.2-0.3 - Rebuilt for ICU 73.2 From 88108d8c98f9a2a3d9713f69d733207991c610f7 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 24 Jul 2023 14:37:02 -0400 Subject: [PATCH 4/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild revert python3-Cython -> python3dist(cython) < 3~~ Signed-off-by: Kaleb S. KEITHLEY --- 0034-src-pybind-rbd-rbd.pyx.patch | 24 ++++++++++++++++++++++++ ceph.spec | 9 +++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 0034-src-pybind-rbd-rbd.pyx.patch diff --git a/0034-src-pybind-rbd-rbd.pyx.patch b/0034-src-pybind-rbd-rbd.pyx.patch new file mode 100644 index 0000000..03f3418 --- /dev/null +++ b/0034-src-pybind-rbd-rbd.pyx.patch @@ -0,0 +1,24 @@ +--- ceph-18.1.2/src/pybind/rbd/rbd.pyx.orig 2023-07-21 13:30:08.156825317 -0400 ++++ ceph-18.1.2/src/pybind/rbd/rbd.pyx 2023-07-24 09:09:27.930137117 -0400 +@@ -371,10 +371,10 @@ + cdef rados_ioctx_t convert_ioctx(rados.Ioctx ioctx) except? NULL: + return ioctx.io + +-cdef int progress_callback(uint64_t offset, uint64_t total, void* ptr) with gil: ++cdef int progress_callback(uint64_t offset, uint64_t total, void* ptr) noexcept with gil: + return (ptr)(offset, total) + +-cdef int no_op_progress_callback(uint64_t offset, uint64_t total, void* ptr): ++cdef int no_op_progress_callback(uint64_t offset, uint64_t total, void* ptr) noexcept with gil: + return 0 + + def cstr(val, name, encoding="utf-8", opt=False): +@@ -426,7 +426,7 @@ + + cdef class Completion + +-cdef void __aio_complete_cb(rbd_completion_t completion, void *args) with gil: ++cdef void __aio_complete_cb(rbd_completion_t completion, void *args) noexcept with gil: + """ + Callback to oncomplete() for asynchronous operations + """ diff --git a/ceph.spec b/ceph.spec index 282a09c..76f8d95 100644 --- a/ceph.spec +++ b/ceph.spec @@ -173,7 +173,7 @@ ################################################################################# Name: ceph Version: 18.1.2 -Release: 0.4%{?dist} +Release: 0.5%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -205,6 +205,7 @@ Patch0029: 0029-src-rgw-rgw_amqp.cc.patch Patch0030: 0030-src-rgw-rgw_asio_client.cc.patch Patch0032: 0032-cmake-modules-BuildBoost.cmake.patch Patch0033: 0033-boost-asm.patch +Patch0034: 0034-src-pybind-rbd-rbd.pyx.patch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl %if 0%{?suse_version} @@ -299,7 +300,7 @@ BuildRequires: procps BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python3dist(cython) < 3~~ +BuildRequires: python%{python3_pkgversion}-Cython BuildRequires: snappy-devel BuildRequires: sqlite-devel BuildRequires: sudo @@ -2634,6 +2635,10 @@ exit 0 %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 2:18.1.2-0.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild +- revert python3-Cython -> python3dist(cython) < 3~~ + * Wed Jul 19 2023 Fedora Release Engineering - 2:18.1.2-0.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - with python3-Cython -> python3dist(cython) < 3~~