From d890f19b5978dd47963176400c29a5a15de663c5 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 24 Oct 2024 21:01:39 -0600 Subject: [PATCH 1/4] Rebuild for yaml-cpp 0.8 --- ceph.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 112dfec..824ebc1 100644 --- a/ceph.spec +++ b/ceph.spec @@ -185,7 +185,7 @@ ################################################################################# Name: ceph Version: 19.2.0 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -2715,6 +2715,9 @@ exit 0 %{python3_sitelib}/ceph_node_proxy-* %changelog +* Fri Oct 25 2024 Orion Poplawski - 2:19.2.0-2 +- Rebuild for yaml-cpp 0.8 + * Fri Sep 20 2024 Kaleb S. KEITHLEY - 2:19.2.0-1 - ceph-19.2.0 GA From 57f6aa766d49afc9ac0da04714386f21742e54dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 21 Oct 2024 11:28:35 +0000 Subject: [PATCH 2/4] Migrate to SPDX license (temporary ids) This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 Note that this is an SPDX identifier, but it still needs to be migrated to the proper identifiers in the fedora-license-data set. --- ceph.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 824ebc1..8081a72 100644 --- a/ceph.spec +++ b/ceph.spec @@ -195,7 +195,8 @@ Epoch: 2 %global _epoch_prefix %{?epoch:%{epoch}:} Summary: User space components of the Ceph file system -License: (LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost and BSD and MIT +License: (LicenseRef-Callaway-LGPLv2+ OR LGPL-3.0-only) AND CC-BY-SA-3.0 AND GPL-2.0-only AND BSL-1.0 AND LicenseRef-Callaway-BSD AND MIT +(LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost and BSD and MIT %if 0%{?suse_version} Group: System/Filesystems %endif From 5b30d830a72a784f38c15fd2c24cb99dd21c14cb Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 13 Nov 2024 14:29:39 -0500 Subject: [PATCH 3/4] ceph-19.2.0 scikit-learn -> scikit_learn rhbz#2325990 --- ceph.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ceph.spec b/ceph.spec index 8081a72..dbd8894 100644 --- a/ceph.spec +++ b/ceph.spec @@ -185,7 +185,7 @@ ################################################################################# Name: ceph Version: 19.2.0 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -195,8 +195,8 @@ Epoch: 2 %global _epoch_prefix %{?epoch:%{epoch}:} Summary: User space components of the Ceph file system -License: (LicenseRef-Callaway-LGPLv2+ OR LGPL-3.0-only) AND CC-BY-SA-3.0 AND GPL-2.0-only AND BSL-1.0 AND LicenseRef-Callaway-BSD AND MIT -(LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost and BSD and MIT +License: License: (LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost and BSD and MIT +### License: (LicenseRef-Callaway-LGPLv2+ OR LGPL-3.0-only) AND CC-BY-SA-3.0 AND GPL-2.0-only AND BSL-1.0 AND LicenseRef-Callaway-BSD AND MIT (LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost and BSD and MIT %if 0%{?suse_version} Group: System/Filesystems %endif @@ -722,7 +722,7 @@ Group: System/Filesystems Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: python%{python3_pkgversion}-numpy %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 10 -Requires: python%{python3_pkgversion}-scikit-learn +Requires: python%{python3_pkgversion}-scikit_learn %endif Requires: python3-scipy %description mgr-diskprediction-local @@ -2716,6 +2716,9 @@ exit 0 %{python3_sitelib}/ceph_node_proxy-* %changelog +* Wed Nov 13 2024 Kaleb S. KEITHLEY - 2:19.2.0-3 +- ceph-19.2.0 scikit-learn -> scikit_learn rhbz#2325990 + * Fri Oct 25 2024 Orion Poplawski - 2:19.2.0-2 - Rebuild for yaml-cpp 0.8 From 542aea1c020c4539a22d3bde12f26a62c17c673e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 11 Nov 2024 23:30:37 +0100 Subject: [PATCH 4/4] fix error in License tag This is follow up of https://src.fedoraproject.org/rpms/ceph/pull-request/15 --- ceph.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ceph.spec b/ceph.spec index dbd8894..ec23114 100644 --- a/ceph.spec +++ b/ceph.spec @@ -195,8 +195,7 @@ Epoch: 2 %global _epoch_prefix %{?epoch:%{epoch}:} Summary: User space components of the Ceph file system -License: License: (LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost and BSD and MIT -### License: (LicenseRef-Callaway-LGPLv2+ OR LGPL-3.0-only) AND CC-BY-SA-3.0 AND GPL-2.0-only AND BSL-1.0 AND LicenseRef-Callaway-BSD AND MIT (LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost and BSD and MIT +License: (LicenseRef-Callaway-LGPLv2+ OR LGPL-3.0-only) AND CC-BY-SA-3.0 AND GPL-2.0-only AND BSL-1.0 AND LicenseRef-Callaway-BSD AND MIT %if 0%{?suse_version} Group: System/Filesystems %endif