diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | remi-release.spec | 35 | ||||
| -rw-r--r-- | remi.repo | 2 |
3 files changed, 21 insertions, 20 deletions
@@ -5,8 +5,8 @@ include ../common/Makefile f35: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f35.remi' --define 'fedora 35' -f34: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f34.remi' --define 'fedora 34' +f37: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f37.remi' --define 'fedora 37' f36: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f36.remi' --define 'fedora 36' diff --git a/remi-release.spec b/remi-release.spec index 67ea4ab..b6155b2 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -10,14 +10,14 @@ Name: remi-release Version: %{fedora} -%if %{fedora} == 36 +%if %{fedora} == 37 Release: 1%{?dist} %endif -%if %{fedora} == 35 -Release: 4%{?dist} +%if %{fedora} == 36 +Release: 2%{?dist} %endif -%if %{fedora} == 34 -Release: 7%{?dist} +%if %{fedora} == 35 +Release: 5%{?dist} %endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -88,10 +88,7 @@ Twitter: https://twitter.com/RemiRepository %prep %setup -c -T -sed -e 's/@VER@/80/;s/@DOTVER@/8.0/' %{SOURCE3} >remi-php80.repo sed -e 's/@VER@/81/;s/@DOTVER@/8.1/' %{SOURCE3} >remi-php81.repo - -sed -e 's/@VER@/80/;s/@DOTVER@/8.0/' %{SOURCE4} >remi-php80-test.repo sed -e 's/@VER@/81/;s/@DOTVER@/8.1/' %{SOURCE4} >remi-php81-test.repo @@ -109,15 +106,15 @@ install -Dp -m 644 %{SOURCE2020} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- install -Dp -m 644 %{SOURCE2021} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2021 install -Dp -m 644 %{SOURCE2022} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2022 +%if %{fedora} <= 37 +ln -s RPM-GPG-KEY-remi2022 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-37 +%endif %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 -%if %{fedora} <= 34 -ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-34 -%endif # YUM install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo @@ -128,23 +125,27 @@ install -m 644 remi-php81.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi- install -m 644 remi-php81-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php81-test.repo %endif -%if %{fedora} < 35 -install -m 644 remi-php80.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php80.repo -install -m 644 remi-php80-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php80-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 install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debuginfo.repo +mkdir -p %{buildroot}/opt/remi + %files %config(noreplace) %{_sysconfdir}/yum.repos.d/remi*.repo %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi* +%dir /opt/remi %changelog +* Mon Jul 11 2022 Remi Collet <remi@remirepo.net> - 37-1, 36-2, 35-5 +- Fedora 36 GPG key +- own /opt/remi +- enable "remi" repository by default as it provides + dependencies of "remi-modular" + * Thu Feb 10 2022 Remi Collet <remi@remirepo.net> - 36-1, 35-4, 34-7 - Fedora 36 using 2022 GPG key @@ -243,7 +244,7 @@ install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debugi * Fri Mar 4 2016 Remi Collet <remi@remirepo.net> - 24-1.fc24 - Fedora release 24 -* Fri Jan 15 2016 Remi Collet <remi@remirepo.net> - %{fedora}-3.fc%{fedora}.remi +* Fri Jan 15 2016 Remi Collet <remi@remirepo.net> - 23-3.fc23.remi - add remi-php70-test repository * Fri Aug 28 2015 Remi Collet <RPMS@FamilleCollet.com> - 23-1.fc23.remi @@ -7,7 +7,7 @@ name=Remi's RPM repository - Fedora $releasever - $basearch #baseurl=http://rpms.remirepo.net/fedora/$releasever/remi/$basearch/ mirrorlist=http://cdn.remirepo.net/fedora/$releasever/remi/$basearch/mirror -enabled=0 +enabled=1 gpgcheck=1 repo_gpgcheck=1 fastestmirror=1 |