diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | remi-release.spec | 30 |
2 files changed, 10 insertions, 23 deletions
@@ -8,6 +8,3 @@ f33: f32: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f32.remi' --define 'fedora 32' -f31: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f31.remi' --define 'fedora 31' - diff --git a/remi-release.spec b/remi-release.spec index a1547af..fc18e95 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -1,6 +1,6 @@ # remirepo spec file for remi-release (Fedora) # -# Copyright (c) 2006-2020 Remi Collet +# Copyright (c) 2006-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -11,12 +11,9 @@ Name: remi-release Version: %{fedora} %if %{fedora} == 33 -Release: 1%{?dist} +Release: 2%{?dist} %endif %if %{fedora} == 32 -Release: 3%{?dist} -%endif -%if %{fedora} == 31 Release: 4%{?dist} %endif Summary: Configuration for remi repository @@ -42,6 +39,7 @@ Source2017: RPM-GPG-KEY-remi2017 Source2018: RPM-GPG-KEY-remi2018 Source2019: RPM-GPG-KEY-remi2019 Source2020: RPM-GPG-KEY-remi2020 +Source2021: RPM-GPG-KEY-remi2021 BuildArch: noarch @@ -59,10 +57,6 @@ the --enablerepo=remi option for %{pkgman}. For PHP 8.0 you must enable the remi-php80 repository: %{pkgman} config-manager --enable remi-php80 %endif -%if %{fedora} >= 29 && %{fedora} <= 31 -For PHP 7.4 you must enable the remi-php74 repository: - %{pkgman} config-manager --enable remi-php74 -%endif FAQ: https://blog.remirepo.net/pages/English-FAQ Forum: https://forum.remirepo.net/ Twitter: https://twitter.com/RemiRepository @@ -77,10 +71,6 @@ l'option --enablerepo=remi de %{pkgman}. Pour PHP 8.0 vous devez activer le dépôt remi-php80 %{pkgman} config-manager --enable remi-php80 %endif -%if %{fedora} >= 29 && %{fedora} <= 31 -Pour PHP 7.4 vous devez activer le dépôt remi-php74 - %{pkgman} config-manager --enable remi-php74 -%endif FAQ: https://blog.remirepo.net/pages/FAQ-en-Francais Forum: https://forum.remirepo.net/ Twitter: https://twitter.com/RemiRepository @@ -113,16 +103,17 @@ install -Dp -m 644 %{SOURCE2017} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- 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 +install -Dp -m 644 %{SOURCE2021} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2021 +%if %{fedora} <= 34 +ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-34 +%endif %if %{fedora} <= 33 ln -s RPM-GPG-KEY-remi2020 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-33 %endif %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 # YUM install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo @@ -131,10 +122,6 @@ install -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-test.r install -m 644 remi-php80.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php80.repo install -m 644 remi-php80-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php80-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 -%endif %if %{fedora} >= 29 install -Dp -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-modular.repo install -Dp -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-modular-test.repo @@ -152,6 +139,9 @@ install -Dp -m 644 remi-glpi94.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi- %changelog +* Mon Jan 4 2021 Remi Collet <remi@remirepo.net> - 33-2, 32-4 +- add new 2021 GPG key + * Tue Aug 18 2020 Remi Collet <remi@remirepo.net> - 33-1, 32-3, 31-4 - Fedora release 33 |