From 84eceb57b50f5910e8612e925f9bee0a0b893cef Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 Feb 2020 15:36:11 +0100 Subject: Fedora release 32 new GPG key --- remi-release.spec | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'remi-release.spec') diff --git a/remi-release.spec b/remi-release.spec index c3a902b..02b3bf4 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -1,6 +1,6 @@ # remirepo spec file for remi-release (Fedora) # -# Copyright (c) 2006-2019 Remi Collet +# Copyright (c) 2006-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,14 +10,14 @@ Name: remi-release Version: %{fedora} -%if %{fedora} == 31 +%if %{fedora} == 32 Release: 1%{?dist} %endif -%if %{fedora} == 30 +%if %{fedora} == 31 Release: 2%{?dist} %endif -%if %{fedora} == 29 -Release: 8%{?dist} +%if %{fedora} == 30 +Release: 3%{?dist} %endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -41,6 +41,7 @@ Source2000: RPM-GPG-KEY-remi Source2017: RPM-GPG-KEY-remi2017 Source2018: RPM-GPG-KEY-remi2018 Source2019: RPM-GPG-KEY-remi2019 +Source2020: RPM-GPG-KEY-remi2020 BuildArch: noarch @@ -58,10 +59,6 @@ the --enablerepo=remi option for %{pkgman}. For PHP 7.4 you must enable the remi-php74 repository: %{pkgman} config-manager --enable remi-php74 %endif -%if %{fedora} >= 27 && %{fedora} <= 29 -For PHP 7.3 you must enable the remi-php73 repository: - %{pkgman} config-manager --enable remi-php73 -%endif FAQ: https://blog.remirepo.net/pages/English-FAQ Forum: https://forum.remirepo.net/ Twitter: https://twitter.com/RemiRepository @@ -76,10 +73,6 @@ l'option --enablerepo=remi de %{pkgman}. Pour PHP 7.4 vous devez activer le dépôt remi-php74 %{pkgman} config-manager --enable remi-php73 %endif -%if %{fedora} >= 27 && %{fedora} <= 29 -Pour PHP 7.3 vous devez activer le dépôt remi-php73 - %{pkgman} config-manager --enable remi-php73 -%endif FAQ: https://blog.remirepo.net/pages/FAQ-en-Francais Forum: https://forum.remirepo.net/ Twitter: https://twitter.com/RemiRepository @@ -113,7 +106,11 @@ install -Dp -m 644 %{SOURCE2000} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- install -Dp -m 644 %{SOURCE2017} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2017 install -Dp -m 644 %{SOURCE2018} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2018 install -Dp -m 644 %{SOURCE2019} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2019 +install -Dp -m 644 %{SOURCE2020} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2020 +%if %{fedora} <= 32 +ln -s RPM-GPG-KEY-remi2020 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-32 +%endif %if %{fedora} <= 31 ln -s RPM-GPG-KEY-remi2019 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-31 %endif @@ -127,10 +124,6 @@ ln -s RPM-GPG-KEY-remi2018 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-r # YUM install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo install -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-test.repo -%if %{fedora} >= 27 && %{fedora} <= 29 -install -m 644 remi-php73.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php73.repo -install -m 644 remi-php73-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php73-test.repo -%endif %if %{fedora} >= 29 && %{fedora} <= 31 install -m 644 remi-php74.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php74.repo install -m 644 remi-php74-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php74-test.repo @@ -152,6 +145,10 @@ install -Dp -m 644 remi-glpi94.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi- %changelog +* Mon Feb 17 2020 Remi Collet - 32-1, 31-2, 30-3 +- Fedora release 32 +- new GPG key + * Fri Mar 1 2019 Remi Collet - 31-1, 30-2, 29-8 - add fedora 31 and php74 repositories -- cgit