diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | remi-modular-test.repo | 13 | ||||
| -rw-r--r-- | remi-release.spec | 59 |
4 files changed, 49 insertions, 42 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc9aa8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm @@ -2,18 +2,13 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile +f31: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f31.remi' --define 'fedora 31' + f30: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f30.remi' --define 'fedora 30' f29: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f29.remi' --define 'fedora 29' -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' - -f26: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f26.remi' --define 'fedora 26' diff --git a/remi-modular-test.repo b/remi-modular-test.repo new file mode 100644 index 0000000..1b53c75 --- /dev/null +++ b/remi-modular-test.repo @@ -0,0 +1,13 @@ +# Repository: https://rpms.remirepo.net/ +# Blog: https://blog.remirepo.net/ +# Forum: https://forum.remirepo.net/ + + +[remi-modular-test] +name=Remi's Modular testing repository - Fedora $releasever - $basearch +#baseurl=http://rpms.remirepo.net/fedora/$releasever/modular-test/$basearch/ +mirrorlist=http://cdn.remirepo.net/fedora/$releasever/modular-test/$basearch/mirror +enabled=0 +gpgcheck=1 +fastestmirror=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever diff --git a/remi-release.spec b/remi-release.spec index 538edb7..c3a902b 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -10,20 +10,14 @@ Name: remi-release Version: %{fedora} -%if %{fedora} == 30 +%if %{fedora} == 31 Release: 1%{?dist} %endif -%if %{fedora} == 29 -Release: 7%{?dist} -%endif -%if %{fedora} == 28 -Release: 7%{?dist} -%endif -%if %{fedora} == 27 -Release: 5%{?dist} +%if %{fedora} == 30 +Release: 2%{?dist} %endif -%if %{fedora} == 26 -Release: 3%{?dist} +%if %{fedora} == 29 +Release: 8%{?dist} %endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -60,14 +54,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} >= 29 && %{fedora} <= 31 +For PHP 7.4 you must enable the remi-php74 repository: + %{pkgman} config-manager --enable remi-php74 +%endif %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 -%endif FAQ: https://blog.remirepo.net/pages/English-FAQ Forum: https://forum.remirepo.net/ Twitter: https://twitter.com/RemiRepository @@ -78,14 +72,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} >= 29 && %{fedora} <= 31 +Pour PHP 7.4 vous devez activer le dépôt remi-php74 + %{pkgman} config-manager --enable remi-php73 +%endif %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 -%endif FAQ: https://blog.remirepo.net/pages/FAQ-en-Francais Forum: https://forum.remirepo.net/ Twitter: https://twitter.com/RemiRepository @@ -93,13 +87,13 @@ 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@/74/;s/@DOTVER@/7.4/' %{SOURCE3} >remi-php74.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@/74/;s/@DOTVER@/7.4/' %{SOURCE4} >remi-php74-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 @@ -120,33 +114,27 @@ install -Dp -m 644 %{SOURCE2017} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- install -Dp -m 644 %{SOURCE2018} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2018 install -Dp -m 644 %{SOURCE2019} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2019 +%if %{fedora} <= 31 +ln -s RPM-GPG-KEY-remi2019 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-31 +%endif %if %{fedora} <= 30 ln -s RPM-GPG-KEY-remi2019 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-30 %endif %if %{fedora} <= 29 ln -s RPM-GPG-KEY-remi2018 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-29 %endif -%if %{fedora} <= 28 -ln -s RPM-GPG-KEY-remi2018 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-28 -%endif -%if %{fedora} <= 27 -ln -s RPM-GPG-KEY-remi2017 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-27 -%endif -%if %{fedora} <= 26 -ln -s RPM-GPG-KEY-remi2017 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-26 -%endif # 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} >= 25 && %{fedora} <= 27 -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} >= 29 && %{fedora} <= 31 +install -m 644 remi-php74.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php74.repo +install -m 644 remi-php74-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php74-test.repo +%endif %if %{fedora} >= 29 install -Dp -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-modular.repo install -Dp -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-modular-test.repo @@ -164,6 +152,9 @@ install -Dp -m 644 remi-glpi94.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi- %changelog +* Fri Mar 1 2019 Remi Collet <remi@remirepo.net> - 31-1, 30-2, 29-8 +- add fedora 31 and php74 repositories + * Fri Mar 1 2019 Remi Collet <remi@remirepo.net> - 30-1 - Fedora release 30 |