diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | remi-release.spec | 25 |
2 files changed, 12 insertions, 19 deletions
@@ -2,13 +2,13 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile +f41: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f41.remi' --define 'fedora 41' + f40: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f40.remi' --define 'fedora 40' 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' - diff --git a/remi-release.spec b/remi-release.spec index e1500c3..0bada8d 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -10,15 +10,15 @@ Name: remi-release Version: %{fedora} +%if %{fedora} == 41 +Release: 1%{?dist} +%endif %if %{fedora} == 40 Release: 1%{?dist} %endif %if %{fedora} == 39 Release: 4%{?dist} %endif -%if %{fedora} == 38 -Release: 5%{?dist} -%endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -50,8 +50,8 @@ Requires: /etc/yum.repos.d Requires: fedora-release >= %{fedora} # For smoth upgrade -%if %{fedora} == 40 -# F40 have ICU 74.2-1 +%if %{fedora} >= 40 +# F40 have ICU 74.2-1, F41 have ICU 74.2-2 Obsoletes: icu74 < 74.3 Obsoletes: libicu74 < 74.3 Obsoletes: libicu74-devel < 74.3 @@ -64,14 +64,7 @@ Obsoletes: libicu73 < 73.3 Obsoletes: libicu73-devel < 73.3 Obsoletes: libicu73-doc < 73.3 %endif -%if %{fedora} == 38 -# Only F38 have ICU 72.1-2 -# libicu72: remi has 72.1-1, F39+ has 72.1-2 -Obsoletes: icu72 < 72.2 -Obsoletes: libicu72 < 72.2 -Obsoletes: libicu72-devel < 72.2 -Obsoletes: libicu72-doc < 72.2 -%endif + %description This package contains %{pkgman} configuration for the "remi" RPM Repository, @@ -155,9 +148,6 @@ ln -s RPM-GPG-KEY-remi2024 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-r %if %{fedora} <= 39 ln -s RPM-GPG-KEY-remi2023 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-39 %endif -%if %{fedora} <= 38 -ln -s RPM-GPG-KEY-remi2023 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-38 -%endif # YUM install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo @@ -189,6 +179,9 @@ mkdir -p %{buildroot}/opt/remi %changelog +* Tue Aug 20 2024 Remi Collet <remi@remirepo.net> - 41-1 +- Fedora 41 using 2024 GPG key + * Wed Feb 14 2024 Remi Collet <remi@remirepo.net> - 40-1 - Fedora 40 using 2024 GPG key |