diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | RPM-GPG-KEY-remi2021 | 52 | ||||
| -rw-r--r-- | remi-release-el.spec | 19 |
3 files changed, 59 insertions, 15 deletions
@@ -2,9 +2,6 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile -el6: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el6.remi' --define 'rhel 6' - el7: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el7.remi' --define 'rhel 7' diff --git a/RPM-GPG-KEY-remi2021 b/RPM-GPG-KEY-remi2021 new file mode 100644 index 0000000..4568da2 --- /dev/null +++ b/RPM-GPG-KEY-remi2021 @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=xAif +-----END PGP PUBLIC KEY BLOCK----- diff --git a/remi-release-el.spec b/remi-release-el.spec index e69e482..9746326 100644 --- a/remi-release-el.spec +++ b/remi-release-el.spec @@ -1,20 +1,14 @@ # remirepo spec file for remi-release (RHEL, CentOS) # -# Copyright (c) 2006-2020 Remi Collet +# Copyright (c) 2006-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # Name: remi-release -%if %{rhel} == 7 -Version: 7.8 +Version: 7.9 Release: 1%{?dist} -%endif -%if %{rhel} == 6 -Version: 6.10 -Release: 2%{?dist} -%endif Summary: YUM configuration for remi repository Summary(fr): Configuration de YUM pour le dépôt remi @@ -36,6 +30,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 BuildArchitectures: noarch @@ -79,10 +74,8 @@ sed -e 's/@VER@/70/;s/@DOTVER@/7.0/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php70.r sed -e 's/@VER@/71/;s/@DOTVER@/7.1/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php71.repo sed -e 's/@VER@/72/;s/@DOTVER@/7.2/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php72.repo sed -e 's/@VER@/73/;s/@DOTVER@/7.3/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php73.repo -%if 0%{?rhel} > 6 sed -e 's/@VER@/74/;s/@DOTVER@/7.4/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php74.repo sed -e 's/@VER@/80/;s/@DOTVER@/8.0/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php80.repo -%endif sed -e 's/@PHP@/5.6/;s/@VER@/91/;s/@DOTVER@/9.1/;s/VERSION/%{rhel}/' %{SOURCE3} >remi-glpi91.repo sed -e 's/@PHP@/5.6/;s/@VER@/92/;s/@DOTVER@/9.2/;s/VERSION/%{rhel}/' %{SOURCE3} >remi-glpi92.repo @@ -92,9 +85,7 @@ sed -e 's/@PHP@/5.6/;s/@VER@/94/;s/@DOTVER@/9.4/;s/VERSION/%{rhel}/' %{SOURCE3} sed -e "s/VERSION/%{rhel}/" %{SOURCE1} | tee remi.repo sed -e "s/VERSION/%{rhel}/" %{SOURCE2} | tee remi-safe.repo sed -e "s/VERSION/%{rhel}/" %{SOURCE5} | tee remi-php54.repo -%if 0%{?rhel} == 7 sed -e "s/VERSION/%{rhel}/" %{SOURCE6} | tee remi-modular.repo -%endif %build @@ -108,6 +99,7 @@ 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 # YUM for repo in *repo @@ -122,6 +114,9 @@ done %changelog +* Mon Jan 4 2024 Remi Collet <remi@remirepo.net> - 7.9-1 +- add 2021 key (used for .src.rpm) + * Mon Aug 17 2020 Remi Collet <remi@remirepo.net> - 7.8-1 - add php 8.0 repository |