From fe674149eb5d49a4ae12de6841f3f1bb244132ae Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 4 Jan 2021 17:15:41 +0100
Subject: add new 2021 GPG key

---
 remi-release-el.spec | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'remi-release-el.spec')

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
 
-- 
cgit