diff options
author | Remi Collet <remi@remirepo.net> | 2021-11-04 14:55:40 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2021-11-04 14:55:40 +0100 |
commit | 724c09bc37ee5eaed5de15609def8f26e26f8511 (patch) | |
tree | a3cce379d8e068945fe05b8e555ad9845d10f344 | |
parent | 66791e17efb802017c15dfa47aa600d1dbc99d72 (diff) |
EL-9 build
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | remi-release.spec | 13 |
2 files changed, 15 insertions, 1 deletions
@@ -5,3 +5,6 @@ include ../common/Makefile el8: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .el8.remi' --define 'rhel 8' +el9: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .el9.remi' --define 'rhel 9' + diff --git a/remi-release.spec b/remi-release.spec index beefc86..1ae6c2b 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -7,6 +7,11 @@ # Please, preserve the changelog entries # Name: remi-release +%if %{?rhel} == 9 +# Match point release version +Version: 9.0 +Release: 1%{?dist} +%endif %if %{?rhel} == 8 # Match point release version Version: 8.4 @@ -42,7 +47,7 @@ BuildArchitectures: noarch # rpm -q --provides cloudlinux-release => redhat-release = 8.4-3.el8 Requires: redhat-release >= %{version} Requires: system-release(releasever) = %{rhel} -Requires: epel-release = %{rhel} +Recommends: epel-release = %{rhel} # Ensure not installable on Fedora Conflicts: fedora-release @@ -96,6 +101,9 @@ install -Dp -m 644 %{SOURCE2021} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- %if %{rhel} <= 8 ln -s RPM-GPG-KEY-remi2018 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi.el8 %endif +%if %{rhel} <= 9 +ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi.el9 +%endif # DNF for repo in *repo @@ -110,6 +118,9 @@ done %changelog +* Thu Nov 4 2021 Remi Collet <remi@remirepo.net> - 9.0-1 +- EL-9 build + * Fri Jul 2 2021 Remi Collet <remi@remirepo.net> - 8.4-1 - raise dependency on redhat-release >= 8.4 - enable repo_gpgcheck for https://github.com/remicollet/remirepo/issues/175 |