From 083cf4692ae3b6893a1dbd5184542d08466d2756 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Jun 2018 10:16:54 +0200 Subject: add php 7.3 repository simplify sources --- remi-release.spec | 55 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 16 deletions(-) (limited to 'remi-release.spec') 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 - 27-4 and 28-3 +- add php 7.3 repository +- simplify sources + * Tue Jun 5 2018 Remi Collet - 27-3 and 28-2 - add GLPI dedicated repostitories - add symlink to have a key per version and allow system upgrade -- cgit