From dba2af71c797c1fe043c127a163db3a66d2494e2 Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Tue, 7 Jul 2026 21:08:43 +0200 Subject: [PATCH 1/2] Match Apache-2.0 license name with SPDX expressions For EPEL the official SPDX license expressions have to be used. Check: - https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ - https://spdx.org/licenses/ - https://docs.fedoraproject.org/en-US/legal/allowed-licenses/ --- confluent_client/confluent_client.spec.tmpl | 2 +- confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl | 2 +- confluent_osdeploy/confluent_osdeploy.spec.tmpl | 2 +- confluent_server/confluent_server.spec.tmpl | 2 +- confluent_vtbufferd/confluent_vtbufferd.spec.tmpl | 2 +- imgutil/confluent_imgutil.spec.tmpl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/confluent_client/confluent_client.spec.tmpl b/confluent_client/confluent_client.spec.tmpl index 63dc1ac2..4bb77b80 100644 --- a/confluent_client/confluent_client.spec.tmpl +++ b/confluent_client/confluent_client.spec.tmpl @@ -11,7 +11,7 @@ Name: %{name} Version: %{version} Release: %{release} Source0: %{name}-%{fversion}.tar.gz -License: Apache2 +License: Apache-2.0 Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Prefix: %{_prefix} diff --git a/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl b/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl index 3730ef13..17f572cd 100644 --- a/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl +++ b/confluent_osdeploy/confluent_osdeploy-aarch64.spec.tmpl @@ -3,7 +3,7 @@ Version: #VERSION# Release: 1 Summary: OS Deployment support for confluent -License: Apache2 +License: Apache-2.0 URL: https://hpc.lenovo.com/ Source0: confluent_osdeploy.tar.xz Source1: confluent_el9bin.tar.xz diff --git a/confluent_osdeploy/confluent_osdeploy.spec.tmpl b/confluent_osdeploy/confluent_osdeploy.spec.tmpl index 77f39c4c..d69afa04 100644 --- a/confluent_osdeploy/confluent_osdeploy.spec.tmpl +++ b/confluent_osdeploy/confluent_osdeploy.spec.tmpl @@ -3,7 +3,7 @@ Version: #VERSION# Release: 1 Summary: OS Deployment support for confluent -License: Apache2 +License: Apache-2.0 URL: https://hpc.lenovo.com/ Source0: confluent_osdeploy.tar.xz Source1: confluent_el9bin.tar.xz diff --git a/confluent_server/confluent_server.spec.tmpl b/confluent_server/confluent_server.spec.tmpl index c96b14ae..7c64b467 100644 --- a/confluent_server/confluent_server.spec.tmpl +++ b/confluent_server/confluent_server.spec.tmpl @@ -11,7 +11,7 @@ Name: %{name} Version: %{version} Release: %{release} Source0: %{name}-%{fversion}.tar.gz -License: Apache2 +License: Apache-2.0 Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Prefix: %{_prefix} diff --git a/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl b/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl index 45f6fedd..b5c599db 100644 --- a/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl +++ b/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl @@ -9,7 +9,7 @@ Name: %{name} Version: %{version} Release: %{release} Source0: %{name}-%{version}.tar.gz -License: Apache2 +License: Apache-2.0 Group: Development/Libraries Vendor: Lenovo HPC Organization Url: https://github.com/lenovo/confluent/ diff --git a/imgutil/confluent_imgutil.spec.tmpl b/imgutil/confluent_imgutil.spec.tmpl index c15b4cc6..3d5f90ca 100644 --- a/imgutil/confluent_imgutil.spec.tmpl +++ b/imgutil/confluent_imgutil.spec.tmpl @@ -2,7 +2,7 @@ Name: confluent_imgutil Version: #VERSION# Release: 1 Summary: Confluent OS imaging utility -License: Apache2 +License: Apache-2.0 URL: https://hpc.lenovo.com/ Source: confluent_imgutil.tar.xz BuildArch: noarch From bb7de607c23075741772ae8a6fd5517e7369882f Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Tue, 7 Jul 2026 21:20:56 +0200 Subject: [PATCH 2/2] Add missing BSD-3-Clause license of tmt.c confluent_vtbufferd/tmt.c has a BSD-3-Clause license as described in confluent_vtbufferd/NOTICE, too. --- confluent_vtbufferd/confluent_vtbufferd.spec.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl b/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl index b5c599db..5d8f9e86 100644 --- a/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl +++ b/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl @@ -9,7 +9,7 @@ Name: %{name} Version: %{version} Release: %{release} Source0: %{name}-%{version}.tar.gz -License: Apache-2.0 +License: Apache-2.0 AND BSD-3-Clause Group: Development/Libraries Vendor: Lenovo HPC Organization Url: https://github.com/lenovo/confluent/