From cb1855937a7e16ffe0f66d6a2ef70b638a6dbc85 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Tue, 27 Aug 2024 08:26:06 +0200 Subject: [PATCH] Update license to SPDX format Resolves: RHEL-43582 --- open-vm-tools.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 856e8f2..76e2c57 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -26,11 +26,7 @@ %global vgauthdaemon vgauthd # gtkmm3 is removed from RHEL 10, bundle it until the project is ported # GTK 4, see RHEL-35537 -%global bundle_gtkmm3 0%{?rhel} && 0%{?rhel} == 10 - -%if 0%{?rhel} == 7 -%global _modulesloaddir %{_prefix}/lib/modules-load.d -%endif +%global bundle_gtkmm3 1 Name: open-vm-tools Version: %{toolsversion} @@ -43,9 +39,9 @@ Summary: Open Virtual Machine Tools for virtual machines hosted on VMwa # gtkmm3.0: LGPL-2.1-or-later AND GPL-2.0-or-later # libsigc++20: LGPL-2.1-or-later # pangomm: LGPL-2.1-or-later AND GPL-2.0-only -License: GPL-2.0 AND W3C AND LGPL-2.1 AND ICU AND ISC AND MIT AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND GPL-2.0-or-later +License: GPL-2.0-only AND W3C AND LGPL-2.1-only AND ICU AND ISC AND MIT AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND GPL-2.0-or-later %else -License: GPL-2.0 AND W3C AND LGPL-2.1 AND ICU AND ISC AND MIT +License: GPL-2.0-only AND W3C AND LGPL-2.1-only AND ICU AND ISC AND MIT %endif URL: https://github.com/vmware/%{name} @@ -625,6 +621,7 @@ fi %changelog * Thu Aug 22 2024 Tomas Popela - 12.4.0-5 - Bundle gtkmm3.0 stack on RHEL 10 to allow its removal +- Update license string to SPDX format * Mon Jun 24 2024 Troy Dawson - 12.4.0-4 - Bump release for June 2024 mass rebuild