diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | remi-release.spec | 15 |
2 files changed, 15 insertions, 5 deletions
@@ -2,12 +2,13 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile +f35: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f35.remi' --define 'fedora 35' + f34: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f34.remi' --define 'fedora 34' 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' diff --git a/remi-release.spec b/remi-release.spec index 969fd76..bbf8e6b 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -10,11 +10,14 @@ Name: remi-release Version: %{fedora} +%if %{fedora} == 35 +Release: 1%{?dist} +%endif %if %{fedora} == 34 -Release: 4%{?dist} +Release: 5%{?dist} %endif %if %{fedora} == 33 -Release: 5%{?dist} +Release: 6%{?dist} %endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -97,6 +100,9 @@ install -Dp -m 644 %{SOURCE2019} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- 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} <= 35 +ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-35 +%endif %if %{fedora} <= 34 ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-34 %endif @@ -130,8 +136,11 @@ install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debugi %changelog +* Fri Sep 3 2021 Remi Collet <remi@remirepo.net> - 35-1, 34-5, 33-6 +- Fedora release 35 + * Thu Sep 2 2021 Remi Collet <remi@remirepo.net> - 34-4, 33-5 -- add php80 repositories +- add php81 repositories * Mon May 17 2021 Remi Collet <remi@remirepo.net> - 34-3, 33-4 - enable repo_gpgcheck for https://github.com/remicollet/remirepo/issues/175 |