From b7f746f5b727f1d0379b3ebb5a272cf9840a90ec Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 17 Feb 2020 17:12:47 +0100
Subject: add 2020 key (used for .src.rpm)

---
 RPM-GPG-KEY-remi2020 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 remi-release-el.spec | 13 ++++++++++---
 2 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 RPM-GPG-KEY-remi2020

diff --git a/RPM-GPG-KEY-remi2020 b/RPM-GPG-KEY-remi2020
new file mode 100644
index 0000000..b25a4e8
--- /dev/null
+++ b/RPM-GPG-KEY-remi2020
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=4jSn
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/remi-release-el.spec b/remi-release-el.spec
index 8ab0da6..fee5539 100644
--- a/remi-release-el.spec
+++ b/remi-release-el.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for remi-release (RHEL, CentOS)
 #
-# Copyright (c) 2006-2019 Remi Collet
+# Copyright (c) 2006-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -9,11 +9,11 @@
 Name:           remi-release
 %if %{rhel} == 7
 Version:        7.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 %if %{rhel} == 6
 Version:        6.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 Summary:        YUM configuration for remi repository
 Summary(fr):    Configuration de YUM pour le dépôt remi
@@ -35,6 +35,7 @@ Source2000:     RPM-GPG-KEY-remi
 Source2017:     RPM-GPG-KEY-remi2017
 Source2018:     RPM-GPG-KEY-remi2018
 Source2019:     RPM-GPG-KEY-remi2019
+Source2020:     RPM-GPG-KEY-remi2020
 
 
 BuildArchitectures: noarch
@@ -78,7 +79,9 @@ 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
+%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
@@ -103,6 +106,7 @@ install -Dp -m 644 %{SOURCE2000} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-
 install -Dp -m 644 %{SOURCE2017} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2017
 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
 
 # YUM
 for repo in *repo
@@ -117,6 +121,9 @@ done
 
 
 %changelog
+* Mon Feb 17 2020 Remi Collet <remi@remirepo.net> - 7.7-2 and 6.10-2
+- add 2020 key (used for .src.rpm)
+
 * Fri Sep  6 2019 Remi Collet <remi@remirepo.net> - 7.7-1
 - add php 7.4 repository
 - add 2019 key
-- 
cgit