diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | remi-php-test.repo | 19 | ||||
| -rw-r--r-- | remi-php.repo | 20 | ||||
| -rw-r--r-- | remi-release.spec | 21 |
4 files changed, 8 insertions, 56 deletions
@@ -2,8 +2,8 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile -f35: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f35.remi' --define 'fedora 35' +f38: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f38.remi' --define 'fedora 38' f37: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f37.remi' --define 'fedora 37' diff --git a/remi-php-test.repo b/remi-php-test.repo deleted file mode 100644 index 4b69285..0000000 --- a/remi-php-test.repo +++ /dev/null @@ -1,19 +0,0 @@ -[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@/$basearch/mirror -# WARNING: If you enable this repository, you must also enable "remi" and "remi-php@VER@" -enabled=0 -gpgcheck=1 -repo_gpgcheck=1 -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 -repo_gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever - diff --git a/remi-php.repo b/remi-php.repo deleted file mode 100644 index 370e2ca..0000000 --- a/remi-php.repo +++ /dev/null @@ -1,20 +0,0 @@ -[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@/$basearch/mirror -# WARNING: If you enable this repository, you must also enable "remi" -enabled=0 -gpgcheck=1 -fastestmirror=1 -repo_gpgcheck=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 -repo_gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever - - diff --git a/remi-release.spec b/remi-release.spec index 80e3ec6..5e7a32d 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -10,15 +10,15 @@ Name: remi-release Version: %{fedora} +%if %{fedora} == 38 +Release: 1%{?dist} +%endif %if %{fedora} == 37 Release: 2%{?dist} %endif %if %{fedora} == 36 Release: 3%{?dist} %endif -%if %{fedora} == 35 -Release: 6%{?dist} -%endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -29,8 +29,6 @@ URL: https://rpms.remirepo.net/ # Repository configuration files Source1: remi.repo Source2: remi-test.repo -Source3: remi-php.repo -Source4: remi-php-test.repo Source6: remi-modular.repo Source7: remi-modular-test.repo Source8: remi-debug.repo @@ -95,8 +93,6 @@ Twitter: https://twitter.com/RemiRepository %prep %setup -c -T -sed -e 's/@VER@/81/;s/@DOTVER@/8.1/' %{SOURCE3} >remi-php81.repo -sed -e 's/@VER@/81/;s/@DOTVER@/8.1/' %{SOURCE4} >remi-php81-test.repo %build @@ -126,19 +122,11 @@ ln -s RPM-GPG-KEY-remi2022 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-r %if %{fedora} <= 36 ln -s RPM-GPG-KEY-remi2022 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-36 %endif -%if %{fedora} <= 35 -ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-35 -%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} < 36 -install -m 644 remi-php81.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php81.repo -install -m 644 remi-php81-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php81-test.repo -%endif - 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 @@ -154,6 +142,9 @@ mkdir -p %{buildroot}/opt/remi %changelog +* Fri Feb 10 2023 Remi Collet <remi@remirepo.net> - 38-1 +- Fedora 38 using 2023 GPG key + * Mon Jul 11 2022 Remi Collet <remi@remirepo.net> - 37-2, 36-3, 35-6 - Add 2023 GPG key (Fedora 38 and 39) |