From 6dfba46506688ddab28c5d7139693874dd9b88d4 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 8 Mar 2022 07:15:44 -0500 Subject: [PATCH 1/3] 16.2.7, Boost license name Signed-off-by: Kaleb S. KEITHLEY --- ceph.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ceph.spec b/ceph.spec index c6ac184..50a377f 100644 --- a/ceph.spec +++ b/ceph.spec @@ -130,7 +130,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 10%{?dist} +Release: 11%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -141,7 +141,7 @@ Epoch: 2 Summary: User space components of the Ceph file system #License: LGPL-2.1 and LGPL-3.0 and CC-BY-SA-3.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT -License: (LGPLv2+ or LGPLv3) and CC-BY-SA-3.0 and GPLv2 and Boost-1.0 and BSD and MIT +License: (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 @@ -1294,9 +1294,8 @@ export CEPH_MFLAGS_JOBS="-j $CEPH_SMP_NCPUS" env | sort -mkdir build -cd build -%{cmake} .. \ +mkdir -p %{_vpath_builddir} +%{cmake} \ -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \ @@ -2528,6 +2527,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Tue Mar 8 2022 Kaleb S. KEITHLEY - 2:16.2.7-11 +- 16.2.7, Boost license name + * Sat Feb 05 2022 Jiri Vanek - 2:16.2.7-10 - Rebuilt for java-17-openjdk as system jdk From 75119cc72fe96896a566a258a171dc9ced77fb88 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 9 Mar 2022 07:24:44 -0500 Subject: [PATCH 2/3] 16.2.7, Boost license name Signed-off-by: Kaleb S. KEITHLEY --- ceph.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index 50a377f..deec6ae 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1406,7 +1406,6 @@ export GCC_COLORS= %install -pushd build %cmake_install # we have dropped sysvinit bits rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph From ff1c66c1f99ab399cc5680e28b6b98e3d8bc8525 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 9 Mar 2022 10:10:54 -0500 Subject: [PATCH 3/3] 16.2.7, Boost license name Signed-off-by: Kaleb S. KEITHLEY --- ceph.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ceph.spec b/ceph.spec index deec6ae..70910ef 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1409,7 +1409,6 @@ export GCC_COLORS= %cmake_install # we have dropped sysvinit bits rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph -popd %if 0%{with seastar} # package crimson-osd with the name of ceph-osd install -m 0755 %{buildroot}%{_bindir}/crimson-osd %{buildroot}%{_bindir}/ceph-osd