diff options
| author | Remi Collet <remi@remirepo.net> | 2024-01-09 10:45:41 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-01-09 10:45:41 +0100 |
| commit | 731fdd097cf4ba1245c6828f928ce5cca17539c3 (patch) | |
| tree | b3ab5d2cfd5de47a787ecfcf72f18bbbc7594996 /remi-release.spec | |
| parent | 2e3c1684e65e6b329e2b998b1d74899f9b59a5c7 (diff) | |
Add 2024 GPG key (Fedora 40 and 41)
Diffstat (limited to 'remi-release.spec')
| -rw-r--r-- | remi-release.spec | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/remi-release.spec b/remi-release.spec index 0ee1fbd..b56f918 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -1,6 +1,6 @@ # remirepo spec file for remi-release (Fedora) # -# Copyright (c) 2006-2023 Remi Collet +# Copyright (c) 2006-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,13 +11,10 @@ Name: remi-release Version: %{fedora} %if %{fedora} == 39 -Release: 3%{?dist} -%endif -%if %{fedora} == 38 Release: 4%{?dist} %endif -%if %{fedora} == 37 -Release: 3%{?dist} +%if %{fedora} == 38 +Release: 5%{?dist} %endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -42,6 +39,7 @@ Source2020: RPM-GPG-KEY-remi2020 Source2021: RPM-GPG-KEY-remi2021 Source2022: RPM-GPG-KEY-remi2022 Source2023: RPM-GPG-KEY-remi2023 +Source2024: RPM-GPG-KEY-remi2024 BuildArch: noarch @@ -64,14 +62,6 @@ Obsoletes: libicu72 < 72.2 Obsoletes: libicu72-devel < 72.2 Obsoletes: libicu72-doc < 72.2 %endif -%if %{fedora} == 37 -# Only F37 have ICU 71.1-2 -# libicu71: remi has 71.1-2, F38+ has 71.1-2 -Obsoletes: icu71 < 71.2 -Obsoletes: libicu71 < 71.2 -Obsoletes: libicu71-devel < 71.2 -Obsoletes: libicu71-doc < 71.2 -%endif %description This package contains %{pkgman} configuration for the "remi" RPM Repository, @@ -120,16 +110,20 @@ install -Dp -m 644 %{SOURCE2020} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- install -Dp -m 644 %{SOURCE2021} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2021 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 +%if %{fedora} <= 41 +ln -s RPM-GPG-KEY-remi2024 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-41 +%endif +%if %{fedora} <= 40 +ln -s RPM-GPG-KEY-remi2024 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-40 +%endif %if %{fedora} <= 39 ln -s RPM-GPG-KEY-remi2023 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-39 %endif %if %{fedora} <= 38 ln -s RPM-GPG-KEY-remi2023 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-38 %endif -%if %{fedora} <= 37 -ln -s RPM-GPG-KEY-remi2022 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-37 -%endif # YUM install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo @@ -150,6 +144,9 @@ mkdir -p %{buildroot}/opt/remi %changelog +* Tue Jan 9 2024 Remi Collet <remi@remirepo.net> - 39-4, 38-5 +- Add 2024 GPG key (Fedora 40 and 41) + * Wed Dec 20 2023 Remi Collet <remi@remirepo.net> - 39-3, 38-4 - disable repo_gpgcheck as it raise too much issue being proxy and CVE-2021-20271 is fixed in rpm |