From e583a308c11c1986cb8d614df4dd91ee14bbe65e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Jan 2025 16:37:48 +0100 Subject: Add 2025 GPG key (Fedora 42 and 43) re-license spec file to CECILL-2.1 --- RPM-GPG-KEY-remi2025 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ remi-release.spec | 22 +++++++++++++++++----- 2 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 RPM-GPG-KEY-remi2025 diff --git a/RPM-GPG-KEY-remi2025 b/RPM-GPG-KEY-remi2025 new file mode 100644 index 0000000..2e8fa80 --- /dev/null +++ b/RPM-GPG-KEY-remi2025 @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=XvkB +-----END PGP PUBLIC KEY BLOCK----- diff --git a/remi-release.spec b/remi-release.spec index 0bada8d..cf84aca 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -1,8 +1,8 @@ # remirepo spec file for remi-release (Fedora) # -# Copyright (c) 2006-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2006-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -11,10 +11,10 @@ Name: remi-release Version: %{fedora} %if %{fedora} == 41 -Release: 1%{?dist} +Release: 2%{?dist} %endif %if %{fedora} == 40 -Release: 1%{?dist} +Release: 2%{?dist} %endif %if %{fedora} == 39 Release: 4%{?dist} @@ -43,6 +43,7 @@ Source2021: RPM-GPG-KEY-remi2021 Source2022: RPM-GPG-KEY-remi2022 Source2023: RPM-GPG-KEY-remi2023 Source2024: RPM-GPG-KEY-remi2024 +Source2025: RPM-GPG-KEY-remi2025 BuildArch: noarch @@ -138,7 +139,14 @@ install -Dp -m 644 %{SOURCE2021} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- install -Dp -m 644 %{SOURCE2022} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2022 install -Dp -m 644 %{SOURCE2023} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2023 install -Dp -m 644 %{SOURCE2024} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2024 +install -Dp -m 644 %{SOURCE2025} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2025 +%if %{fedora} <= 43 +ln -s RPM-GPG-KEY-remi2025 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-43 +%endif +%if %{fedora} <= 42 +ln -s RPM-GPG-KEY-remi2025 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-42 +%endif %if %{fedora} <= 41 ln -s RPM-GPG-KEY-remi2024 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-41 %endif @@ -179,6 +187,10 @@ mkdir -p %{buildroot}/opt/remi %changelog +* Thu Jan 16 2025 Remi Collet - 40-2, 41-2 +- Add 2025 GPG key (Fedora 42 and 43) +- re-license spec file to CECILL-2.1 + * Tue Aug 20 2024 Remi Collet - 41-1 - Fedora 41 using 2024 GPG key -- cgit