Alphabetize the SPDX license terms

This will make it easier to keep track of licenses as we add records
of more of them.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2023-09-25 18:06:51 +01:00
parent 3e96cc229d
commit cb1564bbee

View File

@ -48,7 +48,7 @@ Name: edk2
Version: %{GITDATE} Version: %{GITDATE}
Release: %autorelease Release: %autorelease
Summary: UEFI firmware for 64-bit virtual machines Summary: UEFI firmware for 64-bit virtual machines
License: BSD-2-Clause-Patent AND Apache-2.0 AND MIT License: Apache-2.0 AND BSD-2-Clause-Patent AND MIT
URL: http://www.tianocore.org URL: http://www.tianocore.org
# The source tarball is created using following commands: # The source tarball is created using following commands:
@ -173,7 +173,7 @@ Conflicts: libvirt-daemon-driver-qemu < 9.7.0
# OVMF includes the Secure Boot and IPv6 features; it has a builtin OpenSSL # OVMF includes the Secure Boot and IPv6 features; it has a builtin OpenSSL
# library. # library.
Provides: bundled(openssl) = %{OPENSSL_VER} Provides: bundled(openssl) = %{OPENSSL_VER}
License: BSD-2-Clause-Patent AND Apache-2.0 License: Apache-2.0 AND BSD-2-Clause-Patent
# URL taken from the Maintainers.txt file. # URL taken from the Maintainers.txt file.
URL: http://www.tianocore.org/ovmf/ URL: http://www.tianocore.org/ovmf/
@ -195,7 +195,7 @@ Conflicts: libvirt-daemon-driver-qemu < 9.7.0
# No Secure Boot for AAVMF yet, but we include OpenSSL for the IPv6 stack. # No Secure Boot for AAVMF yet, but we include OpenSSL for the IPv6 stack.
Provides: bundled(openssl) = %{OPENSSL_VER} Provides: bundled(openssl) = %{OPENSSL_VER}
License: BSD-2-Clause-Patent AND Apache-2.0 License: Apache-2.0 AND BSD-2-Clause-Patent
# URL taken from the Maintainers.txt file. # URL taken from the Maintainers.txt file.
URL: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg URL: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
@ -232,7 +232,7 @@ environment for the UEFI and PI specifications. This package contains sample
%if %{defined fedora} %if %{defined fedora}
%package ovmf-ia32 %package ovmf-ia32
Summary: Open Virtual Machine Firmware Summary: Open Virtual Machine Firmware
License: BSD-2-Clause-Patent AND Apache-2.0 License: Apache-2.0 AND BSD-2-Clause-Patent
Provides: bundled(openssl) Provides: bundled(openssl)
BuildArch: noarch BuildArch: noarch
%description ovmf-ia32 %description ovmf-ia32
@ -241,7 +241,7 @@ Open Virtual Machine Firmware (ia32)
%package ovmf-xen %package ovmf-xen
Summary: Open Virtual Machine Firmware, Xen build Summary: Open Virtual Machine Firmware, Xen build
License: BSD-2-Clause-Patent AND Apache-2.0 License: Apache-2.0 AND BSD-2-Clause-Patent
Provides: bundled(openssl) Provides: bundled(openssl)
BuildArch: noarch BuildArch: noarch
%description ovmf-xen %description ovmf-xen
@ -250,7 +250,7 @@ Open Virtual Machine Firmware (Xen build)
%package experimental %package experimental
Summary: Open Virtual Machine Firmware, experimental builds Summary: Open Virtual Machine Firmware, experimental builds
License: BSD-2-Clause-Patent AND Apache-2.0 License: Apache-2.0 AND BSD-2-Clause-Patent
Provides: bundled(openssl) Provides: bundled(openssl)
Obsoletes: edk2-ovmf-experimental < 20230825 Obsoletes: edk2-ovmf-experimental < 20230825
BuildArch: noarch BuildArch: noarch
@ -261,7 +261,7 @@ Open Virtual Machine Firmware (experimental builds)
%package arm %package arm
Summary: ARM Virtual Machine Firmware Summary: ARM Virtual Machine Firmware
BuildArch: noarch BuildArch: noarch
License: BSD-2-Clause-Patent AND Apache-2.0 License: Apache-2.0 AND BSD-2-Clause-Patent
%description arm %description arm
EFI Development Kit II EFI Development Kit II
ARMv7 UEFI Firmware ARMv7 UEFI Firmware
@ -269,7 +269,7 @@ ARMv7 UEFI Firmware
%package riscv64 %package riscv64
Summary: RISC-V Virtual Machine Firmware Summary: RISC-V Virtual Machine Firmware
BuildArch: noarch BuildArch: noarch
License: BSD-2-Clause-Patent AND Apache-2.0 License: Apache-2.0 AND BSD-2-Clause-Patent
# need libvirt version with qcow2 support # need libvirt version with qcow2 support
Conflicts: libvirt-daemon-driver-qemu < 9.7.0 Conflicts: libvirt-daemon-driver-qemu < 9.7.0
@ -280,7 +280,7 @@ RISC-V UEFI Firmware
%package ext4 %package ext4
Summary: Ext4 filesystem driver Summary: Ext4 filesystem driver
License: BSD-2-Clause-Patent AND Apache-2.0 License: Apache-2.0 AND BSD-2-Clause-Patent
BuildArch: noarch BuildArch: noarch
%description ext4 %description ext4
EFI Development Kit II EFI Development Kit II