add php 7.3 repository

simplify sources

9 files changed, 69 insertions, 152 deletions

diff --git a/remi-glpi.repo b/remi-glpi.repo
new file mode 100644
index 0000000..550966d
--- /dev/null
+++ b/remi-glpi.repo
@@ -0,0 +1,12 @@
+# This repository only provides GLPI @DOTVER@ and its plugins
+# NOTICE: you need at least PHP @PHP@
+
+[remi-glpi@VER@]
+name=Remi's GLPI @DOTVER@ RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/glpi@VER@/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/glpi@VER@/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/glpi@VER@/mirror
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+
diff --git a/remi-glpi91.repo b/remi-glpi91.repo
deleted file mode 100644
index 87d5838..0000000
--- a/remi-glpi91.repo
+++ /dev/null
@@ -1,12 +0,0 @@
-# This repository only provides GLPI 9.1 and its plugins
-# NOTICE: you need at least PHP 5.6
-
-[remi-glpi91]
-name=Remi's GLPI 9.1 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/glpi91/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/glpi91/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/glpi91/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
diff --git a/remi-glpi92.repo b/remi-glpi92.repo
deleted file mode 100644
index dc3afb7..0000000
--- a/remi-glpi92.repo
+++ /dev/null
@@ -1,12 +0,0 @@
-# This repository only provides GLPI 9.2 and its plugins
-# NOTICE: you need at least PHP 5.6
-
-[remi-glpi92]
-name=Remi's GLPI 9.2 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/glpi92/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/glpi92/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/glpi92/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
diff --git a/remi-glpi93.repo b/remi-glpi93.repo
deleted file mode 100644
index 160b1eb..0000000
--- a/remi-glpi93.repo
+++ /dev/null
@@ -1,12 +0,0 @@
-# This repository only provides GLPI 9.3 and its plugins
-# NOTICE: you need at least PHP 5.6
-
-[remi-glpi93]
-name=Remi's GLPI 9.3 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/glpi93/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/glpi93/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/glpi93/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
diff --git a/remi-php.repo b/remi-php.repo
new file mode 100644
index 0000000..bf2eb69
--- /dev/null
+++ b/remi-php.repo
@@ -0,0 +1,34 @@
+# This repository only provides PHP @DOTVER@ and its extensions
+# NOTICE: common dependencies are in "remi-safe"
+
+[remi-php@VER@]
+name=Remi's PHP @DOTVER@ RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php@VER@/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php@VER@/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php@VER@/mirror
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+
+[remi-php@VER@-debuginfo]
+name=Remi's PHP @DOTVER@ RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php@VER@/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+
+[remi-php@VER@-test]
+name=Remi's PHP @DOTVER@ test RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test@VER@/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test@VER@/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test@VER@/mirror
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+
+[remi-php@VER@-test-debuginfo]
+name=Remi's PHP @DOTVER@ test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test@VER@/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-php70.repo b/remi-php70.repo
deleted file mode 100644
index 7a6d316..0000000
--- a/remi-php70.repo
+++ /dev/null
@@ -1,34 +0,0 @@
-# This repository only provides PHP 7.0 and its extensions
-# NOTICE: common dependencies are in "remi-safe"
-
-[remi-php70]
-name=Remi's PHP 7.0 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php70/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php70/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php70/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php70-debuginfo]
-name=Remi's PHP 7.0 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php70/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php70-test]
-name=Remi's PHP 7.0 test RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test70/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test70/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test70/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php70-test-debuginfo]
-name=Remi's PHP 7.0 test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test70/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-php71.repo b/remi-php71.repo
deleted file mode 100644
index b27a2af..0000000
--- a/remi-php71.repo
+++ /dev/null
@@ -1,34 +0,0 @@
-# This repository only provides PHP 7.1 and its extensions
-# NOTICE: common dependencies are in "remi-safe"
-
-[remi-php71]
-name=Remi's PHP 7.1 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php71/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php71/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php71/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php71-debuginfo]
-name=Remi's PHP 7.1 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php71/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php71-test]
-name=Remi's PHP 7.1 test RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test71/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test71/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test71/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php71-test-debuginfo]
-name=Remi's PHP 7.1 test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test71/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-php72.repo b/remi-php72.repo
deleted file mode 100644
index 9205075..0000000
--- a/remi-php72.repo
+++ /dev/null
@@ -1,34 +0,0 @@
-# This repository only provides PHP 7.2 and its extensions
-# NOTICE: common dependencies are in "remi-safe"
-
-[remi-php72]
-name=Remi's PHP 7.2 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php72/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php72/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php72/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php72-debuginfo]
-name=Remi's PHP 7.2 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php72/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php72-test]
-name=Remi's PHP 7.2 test RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test72/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test72/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test72/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php72-test-debuginfo]
-name=Remi's PHP 7.2 test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test72/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
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