add php 7.3 repository

simplify sources

12 files changed, 86 insertions, 131 deletions

diff --git a/remi-debug.repo b/remi-debug.repo
index 6871378..3af7f02 100644
--- a/remi-debug.repo
+++ b/remi-debug.repo
@@ -11,32 +11,3 @@ baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
-[remi-php70-debuginfo]
-name=Remi's PHP 7.0 RPM repository for Fedora $releasever - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php70/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
-[remi-php70-test-debuginfo]
-name=Remi's PHP 7.0 test RPM repository for Fedora $releasever - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test70/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
-[remi-php71-debuginfo]
-name=Remi's PHP 7.1 RPM repository for Fedora $releasever - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php71/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
-[remi-php71-test-debuginfo]
-name=Remi's PHP 7.1 test RPM repository for Fedora $releasever - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test71/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
diff --git a/remi-glpi.repo b/remi-glpi.repo
new file mode 100644
index 0000000..d010cf6
--- /dev/null
+++ b/remi-glpi.repo
@@ -0,0 +1,10 @@
+[remi-glpi@VER@]
+name=Remi's RPM repository - GLPI @DOTVER@ - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/glpi@VER@/$basearch/
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/glpi@VER@/mirror
+enabled=0
+gpgcheck=1
+failovermethod=roundrobin
+fastestmirror=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
+
diff --git a/remi-glpi91.repo b/remi-glpi91.repo
deleted file mode 100644
index 44eacca..0000000
--- a/remi-glpi91.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[remi-glpi91]
-name=Remi's RPM repository - GLPI 9.1 - Fedora $releasever - $basearch
-#baseurl=http://rpms.remirepo.net/fedora/$releasever/glpi91/$basearch/
-mirrorlist=http://cdn.remirepo.net/fedora/$releasever/glpi91/mirror
-enabled=0
-gpgcheck=1
-failovermethod=roundrobin
-fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
diff --git a/remi-glpi92.repo b/remi-glpi92.repo
deleted file mode 100644
index d21e140..0000000
--- a/remi-glpi92.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[remi-glpi92]
-name=Remi's RPM repository - GLPI 9.2 - Fedora $releasever - $basearch
-#baseurl=http://rpms.remirepo.net/fedora/$releasever/glpi92/$basearch/
-mirrorlist=http://cdn.remirepo.net/fedora/$releasever/glpi92/mirror
-enabled=0
-gpgcheck=1
-failovermethod=roundrobin
-fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
diff --git a/remi-glpi93.repo b/remi-glpi93.repo
deleted file mode 100644
index ea62f60..0000000
--- a/remi-glpi93.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[remi-glpi93]
-name=Remi's RPM repository - GLPI 9.3 - Fedora $releasever - $basearch
-#baseurl=http://rpms.remirepo.net/fedora/$releasever/glpi93/$basearch/
-mirrorlist=http://cdn.remirepo.net/fedora/$releasever/glpi93/mirror
-enabled=0
-gpgcheck=1
-failovermethod=roundrobin
-fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
diff --git a/remi-php-test.repo b/remi-php-test.repo
new file mode 100644
index 0000000..d143b6f
--- /dev/null
+++ b/remi-php-test.repo
@@ -0,0 +1,18 @@
+[remi-php@VER@-test]
+name=Remi's RPM repository - Testing - PHP @DOTVER@ - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/test@VER@/$basearch/
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/test@VER@/mirror
+# WARNING: If you enable this repository, you must also enable "remi" and "remi-php@VER@"
+enabled=0
+gpgcheck=1
+failovermethod=roundrobin
+fastestmirror=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
+
+[remi-php@VER@-test-debuginfo]
+name=Remi's PHP @DOTVER@ test RPM repository for Fedora $releasever - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test@VER@/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
+
diff --git a/remi-php.repo b/remi-php.repo
new file mode 100644
index 0000000..a381756
--- /dev/null
+++ b/remi-php.repo
@@ -0,0 +1,19 @@
+[remi-php@VER@]
+name=Remi's RPM repository - PHP @DOTVER@ - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/php@VER@/$basearch/
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/php@VER@/mirror
+# WARNING: If you enable this repository, you must also enable "remi"
+enabled=0
+gpgcheck=1
+failovermethod=roundrobin
+fastestmirror=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
+
+[remi-php@VER@-debuginfo]
+name=Remi's PHP @DOTVER@ RPM repository for Fedora $releasever - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php@VER@/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
+
+
diff --git a/remi-php71-test.repo b/remi-php71-test.repo
deleted file mode 100644
index b82d813..0000000
--- a/remi-php71-test.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[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://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
-failovermethod=roundrobin
-fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
diff --git a/remi-php71.repo b/remi-php71.repo
deleted file mode 100644
index 6153982..0000000
--- a/remi-php71.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-[remi-php71]
-name=Remi's RPM repository - PHP 7.1 - Fedora $releasever - $basearch
-#baseurl=http://rpms.remirepo.net/fedora/$releasever/php71/$basearch/
-mirrorlist=http://cdn.remirepo.net/fedora/$releasever/php71/mirror
-# WARNING: If you enable this repository, you must also enable "remi"
-enabled=0
-gpgcheck=1
-failovermethod=roundrobin
-fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
diff --git a/remi-php72-test.repo b/remi-php72-test.repo
deleted file mode 100644
index ccd5483..0000000
--- a/remi-php72-test.repo
+++ /dev/null
@@ -1,18 +0,0 @@
-[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://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
-failovermethod=roundrobin
-fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
-[remi-php72-test-debuginfo]
-name=Remi's PHP 7.2 test RPM repository for Fedora $releasever - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test72/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
diff --git a/remi-php72.repo b/remi-php72.repo
deleted file mode 100644
index e722376..0000000
--- a/remi-php72.repo
+++ /dev/null
@@ -1,18 +0,0 @@
-[remi-php72]
-name=Remi's RPM repository - PHP 7.2 - Fedora $releasever - $basearch
-#baseurl=http://rpms.remirepo.net/fedora/$releasever/php72/$basearch/
-mirrorlist=http://cdn.remirepo.net/fedora/$releasever/php72/mirror
-# WARNING: If you enable this repository, you must also enable "remi"
-enabled=0
-gpgcheck=1
-failovermethod=roundrobin
-fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
-[remi-php72-debuginfo]
-name=Remi's PHP 7.2 RPM repository for Fedora $releasever - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php72/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
-
diff --git a/remi-release.spec b/remi-release.spec
index efa9034..064e8eb 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -11,10 +11,10 @@
 Name:           remi-release
 Version:        %{fedora}
 %if %{fedora} == 28
-Release:        2%{?dist}
+Release:        3%{?dist}
 %endif
 %if %{fedora} == 27
-Release:        3%{?dist}
+Release:        4%{?dist}
 %endif
 %if %{fedora} == 26
 Release:        3%{?dist}
@@ -32,14 +32,10 @@ URL:            https://rpms.remirepo.net/
 # Repository configuration files
 Source1:        remi.repo
 Source2:        remi-test.repo
-Source6:        remi-php71.repo
-Source7:        remi-php71-test.repo
+Source3:        remi-php.repo
+Source4:        remi-php-test.repo
+Source5:        remi-glpi.repo
 Source8:        remi-debug.repo
-Source10:       remi-php72.repo
-Source11:       remi-php72-test.repo
-Source20:       remi-glpi91.repo
-Source21:       remi-glpi92.repo
-Source22:       remi-glpi93.repo
 
 # GPG keys
 Source2000:     RPM-GPG-KEY-remi
@@ -58,6 +54,10 @@ as well as the public GPG keys used to sign them.
 
 The repository is not enabled after installation, so you must use
 the --enablerepo=remi option for %{pkgman}.
+%if %{fedora} >= 27 && %{fedora} <= 29
+For PHP 7.3 you must enable the remi-php73 repository:
+    %{pkgman} config-manager --enable remi-php73
+%endif
 %if %{fedora} >= 25 && %{fedora} <= 27
 For PHP 7.2 you must enable the remi-php72 repository:
     %{pkgman} config-manager --enable remi-php72
@@ -76,6 +76,10 @@ les RPM du dépôt "remi" ainsi que la clé GPG utilisée pour les signer.
 
 Le dépôt n'est pas activé après l'installation, vous devez donc utiliser
 l'option --enablerepo=remi de %{pkgman}.
+%if %{fedora} >= 27 && %{fedora} <= 29
+Pour PHP 7.3 vous devez activer le dépôt remi-php73
+    %{pkgman} config-manager --enable remi-php73
+%endif
 %if %{fedora} >= 25 && %{fedora} <= 27
 Pour PHP 7.2 vous devez activer le dépôt remi-php72
     %{pkgman} config-manager --enable remi-php72
@@ -91,6 +95,17 @@ Twitter: https://twitter.com/RemiRepository
 
 %prep
 %setup -c -T
+sed -e 's/@VER@/71/;s/@DOTVER@/7.1/' %{SOURCE3} >remi-php71.repo
+sed -e 's/@VER@/72/;s/@DOTVER@/7.2/' %{SOURCE3} >remi-php72.repo
+sed -e 's/@VER@/73/;s/@DOTVER@/7.3/' %{SOURCE3} >remi-php73.repo
+
+sed -e 's/@VER@/71/;s/@DOTVER@/7.1/' %{SOURCE4} >remi-php71-test.repo
+sed -e 's/@VER@/72/;s/@DOTVER@/7.2/' %{SOURCE4} >remi-php72-test.repo
+sed -e 's/@VER@/73/;s/@DOTVER@/7.3/' %{SOURCE4} >remi-php73-test.repo
+
+sed -e 's/@VER@/91/;s/@DOTVER@/9.1/' %{SOURCE5} >remi-glpi91.repo
+sed -e 's/@VER@/92/;s/@DOTVER@/9.2/' %{SOURCE5} >remi-glpi92.repo
+sed -e 's/@VER@/93/;s/@DOTVER@/9.3/' %{SOURCE5} >remi-glpi93.repo
 
 
 %build
@@ -122,19 +137,23 @@ ln -s RPM-GPG-KEY-remi2017  %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-r
 install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo
 install -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-test.repo
 %if %{fedora} >= 22 && %{fedora} <= 25
-install -Dp -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php71.repo
-install -Dp -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php71-test.repo
+install -m 644 remi-php71.repo      %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php71.repo
+install -m 644 remi-php71-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php71-test.repo
 %endif
 %if %{fedora} >= 25 && %{fedora} <= 27
-install -Dp -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php72.repo
-install -Dp -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php72-test.repo
+install -m 644 remi-php72.repo      %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php72.repo
+install -m 644 remi-php72-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php72-test.repo
+%endif
+%if %{fedora} >= 27 && %{fedora} <= 29
+install -m 644 remi-php73.repo      %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php73.repo
+install -m 644 remi-php73-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php73-test.repo
 %endif
 %if %{fedora} >= 23
 install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debuginfo.repo
 %endif
-install -Dp -m 644 %{SOURCE20} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-glpi91.repo
-install -Dp -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-glpi92.repo
-install -Dp -m 644 %{SOURCE22} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-glpi93.repo
+install -Dp -m 644 remi-glpi91.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-glpi91.repo
+install -Dp -m 644 remi-glpi92.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-glpi92.repo
+install -Dp -m 644 remi-glpi93.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-glpi93.repo
 
 
 %files
@@ -143,6 +162,10 @@ install -Dp -m 644 %{SOURCE22} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-glpi9
 
 
 %changelog
+* Thu Jun 14 2018 Remi Collet <remi@remirepo.net> - 27-4 and 28-3
+- add php 7.3 repository
+- simplify sources
+
 * Tue Jun  5 2018 Remi Collet <remi@remirepo.net> - 27-3 and 28-2
 - add GLPI dedicated repostitories
 - add symlink to have a key per version and allow system upgrade