summaryrefslogtreecommitdiffstats
path: root/remi-release.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-01-05 14:57:49 +0100
committerRemi Collet <remi@php.net>2023-01-05 14:57:49 +0100
commitbb1807c48bcc989816ad994f8ccae0a3267d976e (patch)
tree89224edf886aaf89237d3d26478f7a53acbd7c3d /remi-release.spec
parent6f75a4ccdd54aabea85a4a45ddcaa3f94f0ca1ed (diff)
2023 key
Diffstat (limited to 'remi-release.spec')
-rw-r--r--remi-release.spec18
1 files changed, 8 insertions, 10 deletions
diff --git a/remi-release.spec b/remi-release.spec
index 7c8ded1..abca0cf 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -10,12 +10,12 @@ Name: remi-release
%if %{?rhel} == 9
# Match point release version
Version: 9.1
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
%if %{?rhel} == 8
# Match point release version
Version: 8.7
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
Summary: YUM configuration for remi repository
Summary(fr): Configuration de YUM pour le dépôt remi
@@ -37,16 +37,12 @@ Source2019: RPM-GPG-KEY-remi2019
Source2020: RPM-GPG-KEY-remi2020
Source2021: RPM-GPG-KEY-remi2021
Source2022: RPM-GPG-KEY-remi2022
+Source2023: RPM-GPG-KEY-remi2023
BuildArchitectures: noarch
-# rpm -q --provides redhat-release => redhat-release = 8.4-0.6.el8
-# rpm -q --provides centos-linux-release => redhat-release = 8.4-1.2105.el8
-# rpm -q --provides centos-stream-release => redhat-release = 8.5-3.el8
-# rpm -q --provides almalinux-release => redhat-release = 8.4-0.6
-# rpm -q --provides rocky-release => redhat-release = 8.4-26.el8
-# rpm -q --provides cloudlinux-release => redhat-release = 8.4-3.el8
-Requires: redhat-release >= %{version}
+# centos-stream-release don't handle minor version
+Requires: (redhat-release >= %{version} or centos-stream-release >= %{rhel})
Requires: system-release(releasever) = %{rhel}
%if %{?rhel} >= 10
Recommends: epel-release = %{rhel}
@@ -127,6 +123,7 @@ 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
install -Dp -m 644 %{SOURCE2022} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2022
+install -Dp -m 644 %{SOURCE2023} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2023
%if %{rhel} <= 8
ln -s RPM-GPG-KEY-remi2018 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi.el8
@@ -162,8 +159,9 @@ mkdir -p %{buildroot}/opt/remi
%changelog
-* Thu Nov 17 2022 Remi Collet <remi@remirepo.net> - 8.7-1 and 9.1-1
+* Thu Nov 17 2022 Remi Collet <remi@remirepo.net> - 8.7-2 and 9.1-2
- raise dependency on redhat-release >= 8.7 or 9.1
+- add 2023 key
* Mon May 23 2022 Remi Collet <remi@remirepo.net> - 8.6-1
- raise dependency on redhat-release >= 8.6