Add the GPG Key used for Fedora 28

switch mirrorlist to cdn.remirepo.net

12 files changed, 90 insertions, 98 deletions

diff --git a/RPM-GPG-KEY-remi2018 b/RPM-GPG-KEY-remi2018
new file mode 100644
index 0000000..e2cc218
--- /dev/null
+++ b/RPM-GPG-KEY-remi2018
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+qk7agVI=
+=sJgk
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/remi-debug-fc.repo b/remi-debug.repo
index c8e1792..c8e1792 100644
--- a/remi-debug-fc.repo
+++ b/remi-debug.repo
diff --git a/remi-el.repo b/remi-el.repo
deleted file mode 100644
index 61a6bfc..0000000
--- a/remi-el.repo
+++ /dev/null
@@ -1,71 +0,0 @@
-# Repository: http://rpms.remirepo.net/
-# Blog:       http://blog.remirepo.net/
-# Forum:      http://forum.remirepo.net/
-
-[remi]
-name=Remi's RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/remi/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/remi/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/remi/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php55]
-name=Remi's PHP 5.5 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php55/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php55/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php55/mirror
-# NOTICE: common dependencies are in "remi-safe"
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php56]
-name=Remi's PHP 5.6 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php56/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php56/httpsmirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php56/mirror
-# NOTICE: common dependencies are in "remi-safe"
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-test]
-name=Remi's test RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test/mirror
-mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/test/mirror
-# WARNING: If you enable this repository, you must also enable "remi"
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-debuginfo]
-name=Remi's RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-remi/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php55-debuginfo]
-name=Remi's PHP 5.5 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php55/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php56-debuginfo]
-name=Remi's PHP 5.6 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php56/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-test-debuginfo]
-name=Remi's test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
diff --git a/remi-php70-test-fc.repo b/remi-php70-test.repo
index 4bf2f2c..7aed769 100644
--- a/remi-php70-test-fc.repo
+++ b/remi-php70-test.repo
@@ -1,7 +1,7 @@
 [remi-php70-test]
 name=Remi's RPM repository - Testing - PHP 7.0 - Fedora $releasever - $basearch
 #baseurl=http://rpms.remirepo.net/fedora/$releasever/test70/$basearch/
-mirrorlist=http://rpms.remirepo.net/fedora/$releasever/test70/mirror
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/test70/mirror
 # WARNING: If you enable this repository, you must also enable "remi" and "remi-php70"
 enabled=0
 gpgcheck=1
diff --git a/remi-php70-fc.repo b/remi-php70.repo
index a6d0804..ed114cd 100644
--- a/remi-php70-fc.repo
+++ b/remi-php70.repo
@@ -1,7 +1,7 @@
 [remi-php70]
 name=Remi's RPM repository - PHP 7.0 - Fedora $releasever - $basearch
 #baseurl=http://rpms.remirepo.net/fedora/$releasever/php70/$basearch/
-mirrorlist=http://rpms.remirepo.net/fedora/$releasever/php70/mirror
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/php70/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 enabled=0
 gpgcheck=1
diff --git a/remi-php71-test-fc.repo b/remi-php71-test.repo
index e6a6efb..a45c38b 100644
--- a/remi-php71-test-fc.repo
+++ b/remi-php71-test.repo
@@ -1,7 +1,7 @@
 [remi-php71-test]
 name=Remi's RPM repository - Testing - PHP 7.1 - Fedora $releasever - $basearch
 #baseurl=http://rpms.remirepo.net/fedora/$releasever/test71/$basearch/
-mirrorlist=http://rpms.remirepo.net/fedora/$releasever/test71/mirror
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/test71/mirror
 # WARNING: If you enable this repository, you must also enable "remi" and "remi-php71"
 enabled=0
 gpgcheck=1
diff --git a/remi-php71-fc.repo b/remi-php71.repo
index 15ef7ec..a9c7d0b 100644
--- a/remi-php71-fc.repo
+++ b/remi-php71.repo
@@ -1,7 +1,7 @@
 [remi-php71]
 name=Remi's RPM repository - PHP 7.1 - Fedora $releasever - $basearch
 #baseurl=http://rpms.remirepo.net/fedora/$releasever/php71/$basearch/
-mirrorlist=http://rpms.remirepo.net/fedora/$releasever/php71/mirror
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/php71/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 enabled=0
 gpgcheck=1
diff --git a/remi-php72-test-fc.repo b/remi-php72-test.repo
index f44c4fc..3336f5d 100644
--- a/remi-php72-test-fc.repo
+++ b/remi-php72-test.repo
@@ -1,7 +1,7 @@
 [remi-php72-test]
 name=Remi's RPM repository - Testing - PHP 7.2 - Fedora $releasever - $basearch
 #baseurl=http://rpms.remirepo.net/fedora/$releasever/test72/$basearch/
-mirrorlist=http://rpms.remirepo.net/fedora/$releasever/test72/mirror
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/test72/mirror
 # WARNING: If you enable this repository, you must also enable "remi" and "remi-php72"
 enabled=0
 gpgcheck=1
diff --git a/remi-php72-fc.repo b/remi-php72.repo
index bb01b6b..b7c2d30 100644
--- a/remi-php72-fc.repo
+++ b/remi-php72.repo
@@ -1,7 +1,7 @@
 [remi-php72]
 name=Remi's RPM repository - PHP 7.2 - Fedora $releasever - $basearch
 #baseurl=http://rpms.remirepo.net/fedora/$releasever/php72/$basearch/
-mirrorlist=http://rpms.remirepo.net/fedora/$releasever/php72/mirror
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/php72/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 enabled=0
 gpgcheck=1
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
 
diff --git a/remi-test-fc.repo b/remi-test.repo
index bfd9013..e150f45 100644
--- a/remi-test-fc.repo
+++ b/remi-test.repo
@@ -1,7 +1,7 @@
 [remi-test]
 name=Remi's RPM repository - Testing - Fedora $releasever - $basearch
 #baseurl=http://rpms.remirepo.net/fedora/$releasever/test/$basearch/
-mirrorlist=http://rpms.remirepo.net/fedora/$releasever/test/mirror
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/test/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 enabled=0
 gpgcheck=1
diff --git a/remi-fc.repo b/remi.repo
index 4958713..80d269f 100644
--- a/remi-fc.repo
+++ b/remi.repo
@@ -6,7 +6,7 @@
 [remi]
 name=Remi's RPM repository - Fedora $releasever - $basearch
 #baseurl=http://rpms.remirepo.net/fedora/$releasever/remi/$basearch/
-mirrorlist=http://rpms.remirepo.net/fedora/$releasever/remi/mirror
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/remi/mirror
 enabled=0
 gpgcheck=1
 failovermethod=roundrobin