From 019e41c567494589bfef17cc6a3e0117a689505c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 12 Jan 2018 14:57:42 +0100
Subject: Add the GPG Key used for Fedora 28 switch mirrorlist to
 cdn.remirepo.net

---
 remi-release.spec | 49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

(limited to 'remi-release.spec')

diff --git a/remi-release.spec b/remi-release.spec
index 94ed14f..4185573 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -11,10 +11,10 @@
 Name:           remi-release
 Version:        %{fedora}
 %if %{fedora} == 27
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 %if %{fedora} == 26
-Release:        2%{?dist}
+Release:        3%{?dist}
 %endif
 %if %{fedora} == 25
 Release:        4%{?dist}
@@ -28,25 +28,26 @@ Summary(fr):	Configuration pour le dépôt remi
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            https://rpms.remirepo.net/
-Source0:        RPM-GPG-KEY-remi
-Source1:        remi-fc.repo
-Source2:        remi-test-fc.repo
-Source4:        remi-php70-fc.repo
-Source5:        remi-php70-test-fc.repo
-Source6:        remi-php71-fc.repo
-Source7:        remi-php71-test-fc.repo
-Source8:        remi-debug-fc.repo
-Source9:        RPM-GPG-KEY-remi2017
-Source10:       remi-php72-fc.repo
-Source11:       remi-php72-test-fc.repo
+
+# Repository configuration files
+Source1:        remi.repo
+Source2:        remi-test.repo
+Source4:        remi-php70.repo
+Source5:        remi-php70-test.repo
+Source6:        remi-php71.repo
+Source7:        remi-php71-test.repo
+Source8:        remi-debug.repo
+Source10:       remi-php72.repo
+Source11:       remi-php72-test.repo
+
+# GPG keys
+Source2000:     RPM-GPG-KEY-remi
+Source2017:     RPM-GPG-KEY-remi2017
+Source2018:     RPM-GPG-KEY-remi2018
 
 BuildArch:      noarch
 
-%if %{fedora} < 21
-Requires:       yum
-%else
 Requires:       /etc/yum.repos.d
-%endif
 Requires:       fedora-release >= %{fedora}
 
 
@@ -105,8 +106,9 @@ echo empty build
 rm -rf %{buildroot}
 
 # PGP
-install -Dp -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
-install -Dp -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2017
+install -Dp -m 644 %{SOURCE2000} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
+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
 
 # YUM
 install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo
@@ -127,6 +129,11 @@ install -Dp -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php72
 install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debuginfo.repo
 %endif
 
+%if %{fedora} >= 28
+: Use new GPG Key
+sed -e 's/RPM-GPG-KEY-remi/RPM-GPG-KEY-remi2018/' \
+    -i %{buildroot}%{_sysconfdir}/yum.repos.d/*repo
+%endif
 %if %{fedora} >= 26
 : Use new GPG Key
 sed -e 's/RPM-GPG-KEY-remi/RPM-GPG-KEY-remi2017/' \
@@ -140,6 +147,10 @@ sed -e 's/RPM-GPG-KEY-remi/RPM-GPG-KEY-remi2017/' \
 
 
 %changelog
+* Fri Jan 12 2018 Remi Collet <remi@remirepo.net> - 27-2, 26-3
+- Add the GPG Key used for Fedora 28
+- switch mirrorlist to cdn.remirepo.net
+
 * Tue Aug 22 2017 Remi Collet <remi@remirepo.net> - 27-1
 - Fedora release 27
 
-- 
cgit