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 --- remi-release.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'remi-release.spec') 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