diff options
| author | Remi Collet <remi@remirepo.net> | 2023-08-21 16:25:02 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-08-21 16:25:02 +0200 |
| commit | a1f92c16929be9842f47463a29cfddac8f4b3bcd (patch) | |
| tree | 9b4aed9a0a91c309c80744a81e5d08a7e91fdbe0 | |
| parent | b9ac0b82c42daf83740715638aae912e7bc3c6a9 (diff) | |
Fedora 39 using 2023 GPG key
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | remi-release.spec | 26 |
2 files changed, 16 insertions, 16 deletions
@@ -2,13 +2,13 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile +f39: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f36.remi' --define 'fedora 39' + 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' -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 acb34eb..dde74fd 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -10,15 +10,15 @@ Name: remi-release Version: %{fedora} +%if %{fedora} == 39 +Release: 1%{?dist} +%endif %if %{fedora} == 38 Release: 2%{?dist} %endif %if %{fedora} == 37 Release: 2%{?dist} %endif -%if %{fedora} == 36 -Release: 3%{?dist} -%endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -49,24 +49,24 @@ Requires: /etc/yum.repos.d Requires: fedora-release >= %{fedora} # For smoth upgrade +%if %{fedora} >= 39 +Obsoletes: icu73 < 73.2 +Obsoletes: libicu73 < 73.2 +Obsoletes: libicu73-devel < 73.2 +Obsoletes: libicu73-doc < 73.2 +%endif %if %{fedora} >= 38 Obsoletes: icu72 < 72.2 Obsoletes: libicu72 < 72.2 Obsoletes: libicu72-devel < 72.2 Obsoletes: libicu72-doc < 72.2 %endif -%if %{fedora} == 37 +%if %{fedora} >= 37 Obsoletes: icu71 < 71.2 Obsoletes: libicu71 < 71.2 Obsoletes: libicu71-devel < 71.2 Obsoletes: libicu71-doc < 71.2 %endif -%if %{fedora} == 36 -Obsoletes: icu69 < 69.2 -Obsoletes: libicu69 < 69.2 -Obsoletes: libicu69-devel < 69.2 -Obsoletes: libicu69-doc < 69.2 -%endif %description This package contains %{pkgman} configuration for the "remi" RPM Repository, @@ -125,9 +125,6 @@ ln -s RPM-GPG-KEY-remi2023 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-r %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 # YUM install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo @@ -148,6 +145,9 @@ mkdir -p %{buildroot}/opt/remi %changelog +* Mon Aug 21 2023 Remi Collet <remi@remirepo.net> - 39-1 +- Fedora 39 using 2023 GPG key + * Fri Apr 14 2023 Remi Collet <remi@remirepo.net> - 38-2 - obsoletes icu72 for smoth upgrade from F36/F37 |