From 8435c8e13d5a7763ea3700c15018e007303bd3b7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 19 Jun 2018 10:29:01 +0200
Subject: add php 7.3 repository simplify sources

---
 remi-release-el.spec | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

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

diff --git a/remi-release-el.spec b/remi-release-el.spec
index 63da9e1..1b221a9 100644
--- a/remi-release-el.spec
+++ b/remi-release-el.spec
@@ -9,11 +9,11 @@
 Name:           remi-release
 %if %{rhel} == 7
 Version:        7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 %if %{rhel} == 6
 Version:        6.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 %endif
 Summary:        YUM configuration for remi repository
 Summary(fr):    Configuration de YUM pour le dépôt remi
@@ -25,13 +25,9 @@ URL:            https://remirepo.net
 # Repository configuration files
 Source1:        remi-el.repo
 Source2:        remi-safe.repo
-Source3:        remi-php70.repo
-Source4:        remi-php71.repo
+Source3:        remi-glpi.repo
+Source4:        remi-php.repo
 Source5:        remi-php54.repo
-Source7:        remi-php72.repo
-Source20:       remi-glpi91.repo
-Source21:       remi-glpi92.repo
-Source22:       remi-glpi93.repo
 
 # GPG Keys
 Source2000:     RPM-GPG-KEY-remi
@@ -67,6 +63,9 @@ For PHP 7.1 you must enable the remi-php71 repository:
 For PHP 7.2 you must enable the remi-php72 repository:
     yum-config-manager --enable remi-php72
 
+For PHP 7.3 you must enable the remi-php73 repository:
+    yum-config-manager --enable remi-php73
+
 Software Collections are in the "remi-safe" repository.
 
 FAQ:     https://blog.remirepo.net/pages/English-FAQ
@@ -91,6 +90,9 @@ Pour PHP 7.1 vous devez activer le dépôt remi-php71
 Pour PHP 7.2 vous devez activer le dépôt remi-php72
     yum-config-manager --enable remi-php72
 
+Pour PHP 7.3 vous devez activer le dépôt remi-php73
+    yum-config-manager --enable remi-php73
+
 Les "Software Collections" sont dans le dépôt "remi-safe".
 
 FAQ:     https://blog.remirepo.net/pages/FAQ-en-Francais
@@ -100,15 +102,18 @@ Twitter: https://twitter.com/RemiRepository
 
 %prep
 %setup -c -T
+sed -e 's/@VER@/70/;s/@DOTVER@/7.0/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php70.repo
+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
+
+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
+sed -e 's/@PHP@/5.6/;s/@VER@/93/;s/@DOTVER@/9.3/;s/VERSION/%{rhel}/' %{SOURCE3} >remi-glpi93.repo
+
 sed -e "s/VERSION/%{rhel}/" %{SOURCE1} | tee remi.repo
 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
-sed -e "s/VERSION/%{rhel}/" %{SOURCE20} | tee remi-glpi91.repo
-sed -e "s/VERSION/%{rhel}/" %{SOURCE21} | tee remi-glpi92.repo
-sed -e "s/VERSION/%{rhel}/" %{SOURCE22} | tee remi-glpi93.repo
 
 
 %build
@@ -134,6 +139,10 @@ done
 
 
 %changelog
+* Tue Jun 19 2018 Remi Collet <remi@remirepo.net> - 6.9-4 and 7.5-2
+- add php 7.3 repository
+- simplify sources
+
 * Tue Jun  5 2018 Remi Collet <remi@remirepo.net> - 6.9-3 and 7.5-1
 - add GLPI dedicated repostitories
 
-- 
cgit