From 098cba2b6f5bfd4ae6ca837b02bd99b6ad5c85bb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Feb 2018 09:02:51 +0100 Subject: Fedora 28 --- Makefile | 6 +++--- remi-php70-test.repo | 10 ---------- remi-php70.repo | 10 ---------- remi-release.spec | 38 +++++++++++++------------------------- 4 files changed, 16 insertions(+), 48 deletions(-) delete mode 100644 remi-php70-test.repo delete mode 100644 remi-php70.repo diff --git a/Makefile b/Makefile index 5c4273b..031476f 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,9 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile +f28: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f28.remi' --define 'fedora 28' + f27: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f27.remi' --define 'fedora 27' @@ -11,6 +14,3 @@ f26: f25: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f25.remi' --define 'fedora 25' -f24: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f24.remi' --define 'fedora 24' - diff --git a/remi-php70-test.repo b/remi-php70-test.repo deleted file mode 100644 index 7aed769..0000000 --- a/remi-php70-test.repo +++ /dev/null @@ -1,10 +0,0 @@ -[remi-php70-test] -name=Remi's RPM repository - Testing - PHP 7.0 - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/test70/$basearch/ -mirrorlist=http://cdn.remirepo.net/fedora/$releasever/test70/mirror -# WARNING: If you enable this repository, you must also enable "remi" and "remi-php70" -enabled=0 -gpgcheck=1 -failovermethod=roundrobin -fastestmirror=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 ed114cd..0000000 --- a/remi-php70.repo +++ /dev/null @@ -1,10 +0,0 @@ -[remi-php70] -name=Remi's RPM repository - PHP 7.0 - Fedora $releasever - $basearch -#baseurl=http://rpms.remirepo.net/fedora/$releasever/php70/$basearch/ -mirrorlist=http://cdn.remirepo.net/fedora/$releasever/php70/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 diff --git a/remi-release.spec b/remi-release.spec index f244b44..b71bb33 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -1,6 +1,6 @@ # remirepo spec file for remi-release (Fedora) # -# Copyright (c) 2006-2017 Remi Collet +# Copyright (c) 2006-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,6 +10,9 @@ Name: remi-release Version: %{fedora} +%if %{fedora} == 28 +Release: 1%{?dist} +%endif %if %{fedora} == 27 Release: 2%{?dist} %endif @@ -19,9 +22,6 @@ Release: 3%{?dist} %if %{fedora} == 25 Release: 4%{?dist} %endif -%if %{fedora} == 24 -Release: 4%{?dist} -%endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -32,8 +32,6 @@ URL: https://rpms.remirepo.net/ # Repository configuration files Source1: remi.repo Source2: remi-test.repo -Source4: remi-php70.repo -Source5: remi-php70-test.repo Source6: remi-php71.repo Source7: remi-php71-test.repo Source8: remi-debug.repo @@ -57,18 +55,14 @@ 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} >= 25 +%if %{fedora} >= 25 && %{fedora} <= 27 For PHP 7.2 you must enable the remi-php72 repository: - %{pkgman} config-manager --enable remi-php71 + %{pkgman} config-manager --enable remi-php72 %endif %if %{fedora} >= 22 && %{fedora} <= 25 For PHP 7.1 you must enable the remi-php71 repository: %{pkgman} config-manager --enable remi-php71 %endif -%if %{fedora} >= 21 && %{fedora} <= 24 -For PHP 7.0 you must enable the remi-php70 repository: - %{pkgman} config-manager --enable remi-php70 -%endif FAQ: https://blog.remirepo.net/pages/English-FAQ Forum: https://forum.remirepo.net/ Twitter: https://twitter.com/RemiRepository @@ -79,18 +73,14 @@ 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} >= 25 -Pour PHP 7.2 vous devez activer le dépôt remi-php71 - %{pkgman} config-manager --enable remi-php71 +%if %{fedora} >= 25 && %{fedora} <= 27 +Pour PHP 7.2 vous devez activer le dépôt remi-php72 + %{pkgman} config-manager --enable remi-php72 %endif %if %{fedora} >= 22 && %{fedora} <= 25 Pour PHP 7.1 vous devez activer le dépôt remi-php71 %{pkgman} config-manager --enable remi-php71 %endif -%if %{fedora} >= 21 && %{fedora} <= 24 -Pour PHP 7.0 vous devez activer le dépôt remi-php70 - %{pkgman} config-manager --enable remi-php70 -%endif FAQ: https://blog.remirepo.net/pages/FAQ-en-Francais Forum: https://forum.remirepo.net/ Twitter: https://twitter.com/RemiRepository @@ -115,15 +105,11 @@ install -Dp -m 644 %{SOURCE2018} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- # YUM 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} >= 21 && %{fedora} <= 24 -install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php70.repo -install -Dp -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php70-test.repo -%endif %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 %endif -%if %{fedora} >= 25 +%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 %endif @@ -136,7 +122,7 @@ install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debugi sed -e 's/RPM-GPG-KEY-remi/RPM-GPG-KEY-remi2018/' \ -i %{buildroot}%{_sysconfdir}/yum.repos.d/*repo %endif -%if %{fedora} >= 26 +%if %{fedora} >= 26 && %{fedora} <= 27 : Use new GPG Key sed -e 's/RPM-GPG-KEY-remi/RPM-GPG-KEY-remi2017/' \ -i %{buildroot}%{_sysconfdir}/yum.repos.d/*repo @@ -149,6 +135,8 @@ sed -e 's/RPM-GPG-KEY-remi/RPM-GPG-KEY-remi2017/' \ %changelog +* Mon Feb 26 2018 Remi Collet - 28-1 +- Fedora release 28 - fix package License (CC-BY-SA) * Fri Jan 12 2018 Remi Collet - 27-2, 26-3 -- cgit