From 1b543c43299e2a2286333a07734ad1e8c69af914 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 16 Jan 2018 08:09:55 +0100
Subject: Add the GPG Key used for 2018 distributions switch http mirrorlist to
 cdn.remirepo.net fix package License (CC-BY-SA)

---
 remi-release-el.spec | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

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

diff --git a/remi-release-el.spec b/remi-release-el.spec
index 9337295..a30a833 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-2017 Remi Collet
+# Copyright (c) 2006-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -8,30 +8,37 @@
 #
 Name:           remi-release
 %if %{rhel} == 7
-Version:        7.3
-Release:        2%{?dist}
+Version:        7.4
+Release:        1%{?dist}
 %endif
 %if %{rhel} == 6
 Version:        6.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 Summary:        YUM configuration for remi repository
 Summary(fr):    Configuration de YUM pour le dépôt remi
 
 Group:          System Environment/Base
-License:        GPL
+License:        CC-BY-SA
 URL:            https://remirepo.net
-Source0:        RPM-GPG-KEY-remi
+
+# Repository configuration files
 Source1:        remi-el.repo
 Source2:        remi-safe.repo
 Source3:        remi-php70.repo
 Source4:        remi-php71.repo
 Source5:        remi-php54.repo
-Source6:        RPM-GPG-KEY-remi2017
 Source7:        remi-php72.repo
 
+# GPG Keys
+Source2000:     RPM-GPG-KEY-remi
+Source2017:     RPM-GPG-KEY-remi2017
+Source2018:     RPM-GPG-KEY-remi2018
+
+
 BuildArchitectures: noarch
 
+
 Requires:       yum
 # Sadly system-release and redhat-release are not versionned
 Requires:       redhat-release
@@ -60,8 +67,9 @@ For PHP 7.2 you must enable the remi-php72 repository:
 
 Software Collections are in the "remi-safe" repository.
 
-FAQ:   https://blog.remirepo.net/pages/English-FAQ
-Forum: https://forum.remirepo.net/
+FAQ:     https://blog.remirepo.net/pages/English-FAQ
+Forum:   https://forum.remirepo.net/
+Twitter: https://twitter.com/RemiRepository
 
 %description -l fr
 Ce paquetage contient le fichier de configuration de YUM pour utiliser
@@ -83,21 +91,19 @@ Pour PHP 7.2 vous devez activer le dépôt remi-php72
 
 Les "Software Collections" sont dans le dépôt "remi-safe".
 
-FAQ:   https://blog.remirepo.net/pages/FAQ-en-Francais
-Forum: https://forum.remirepo.net/
+FAQ:     https://blog.remirepo.net/pages/FAQ-en-Francais
+Forum:   https://forum.remirepo.net/
+Twitter: https://twitter.com/RemiRepository
 
 
 %prep
 %setup -c -T
 sed -e "s/VERSION/%{rhel}/" %{SOURCE1} | tee remi.repo
-
-%if %{rhel} >= 6
 sed -e "s/VERSION/%{rhel}/" %{SOURCE2} | tee remi-safe.repo
 sed -e "s/VERSION/%{rhel}/" %{SOURCE3} | tee remi-php70.repo
 sed -e "s/VERSION/%{rhel}/" %{SOURCE4} | tee remi-php71.repo
 sed -e "s/VERSION/%{rhel}/" %{SOURCE5} | tee remi-php54.repo
 sed -e "s/VERSION/%{rhel}/" %{SOURCE7} | tee remi-php72.repo
-%endif
 
 
 %build
@@ -106,8 +112,9 @@ echo empty build
 
 %install
 # PGP
-install -Dp -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
-install -Dp -m 644 %{SOURCE6} %{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
 for repo in *repo
@@ -122,6 +129,11 @@ done
 
 
 %changelog
+* Tue Jan 16 2018 Remi Collet <remmi@remirepo.net> - 6.9-2 and 7.4-1
+- Add the GPG Key used for 2018 distributions
+- switch http mirrorlist to cdn.remirepo.net
+- fix package License (CC-BY-SA)
+
 * Thu Jun 29 2017 Remi Collet <remmi@remirepo.net> - 6.9-1 and 7.3-2
 - add remi-php72 repository configuration
 
-- 
cgit