diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | remi-release.spec | 22 |
2 files changed, 14 insertions, 16 deletions
@@ -2,14 +2,12 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile +f33: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f33.remi' --define 'fedora 33' + 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' -f30: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f30.remi' --define 'fedora 30' - - - diff --git a/remi-release.spec b/remi-release.spec index 95377f4..a1547af 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -10,14 +10,14 @@ Name: remi-release Version: %{fedora} -%if %{fedora} == 32 -Release: 2%{?dist} +%if %{fedora} == 33 +Release: 1%{?dist} %endif -%if %{fedora} == 31 +%if %{fedora} == 32 Release: 3%{?dist} %endif -%if %{fedora} == 30 -Release: 3%{?dist} +%if %{fedora} == 31 +Release: 4%{?dist} %endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -114,18 +114,15 @@ install -Dp -m 644 %{SOURCE2018} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- 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} <= 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 -%if %{fedora} <= 30 -ln -s RPM-GPG-KEY-remi2019 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-30 -%endif -%if %{fedora} <= 29 -ln -s RPM-GPG-KEY-remi2018 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-29 -%endif # YUM install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo @@ -155,6 +152,9 @@ install -Dp -m 644 remi-glpi94.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi- %changelog +* Tue Aug 18 2020 Remi Collet <remi@remirepo.net> - 33-1, 32-3, 31-4 +- Fedora release 33 + * Mon Aug 17 2020 Remi Collet <remi@remirepo.net> - 32-2, 31-3 - add php80 repositories |