diff options
| author | Remi Collet <remi@remirepo.net> | 2025-02-06 10:38:15 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-02-06 10:38:15 +0100 |
| commit | f20ccfc51f9a77fe12c2fa11d5692134d55ddd76 (patch) | |
| tree | 2aa5a893c57920ad4de6ebd8211915aed529162b | |
| parent | e583a308c11c1986cb8d614df4dd91ee14bbe65e (diff) | |
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | remi-release.spec | 30 |
2 files changed, 17 insertions, 17 deletions
@@ -8,7 +8,7 @@ f41: 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' +f42: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f36.remi' --define 'fedora 42' diff --git a/remi-release.spec b/remi-release.spec index cf84aca..8ec2315 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -10,20 +10,20 @@ Name: remi-release Version: %{fedora} +%if %{fedora} == 42 +Release: 1%{?dist} +%endif %if %{fedora} == 41 Release: 2%{?dist} %endif %if %{fedora} == 40 Release: 2%{?dist} %endif -%if %{fedora} == 39 -Release: 4%{?dist} -%endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi Group: System Environment/Base -License: CC-BY-SA-4.0 +License: CECILL-2.1 URL: https://rpms.remirepo.net/ # Repository configuration files @@ -51,20 +51,20 @@ Requires: /etc/yum.repos.d Requires: fedora-release >= %{fedora} # For smoth upgrade -%if %{fedora} >= 40 +%if %{fedora} == 42 +# F42 have ICU 76.1-4 +Obsoletes: icu76 < 76.2 +Obsoletes: libicu76 < 76.2 +Obsoletes: libicu76-devel < 76.2 +Obsoletes: libicu76-doc < 76.2 +%endif +%if %{fedora} == 40 || %{fedora} == 41 # 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 Obsoletes: libicu74-doc < 74.3 %endif -%if %{fedora} == 39 -# F39 have ICU 73.2-2 -Obsoletes: icu73 < 73.3 -Obsoletes: libicu73 < 73.3 -Obsoletes: libicu73-devel < 73.3 -Obsoletes: libicu73-doc < 73.3 -%endif %description @@ -153,9 +153,6 @@ ln -s RPM-GPG-KEY-remi2024 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-r %if %{fedora} <= 40 ln -s RPM-GPG-KEY-remi2024 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-40 %endif -%if %{fedora} <= 39 -ln -s RPM-GPG-KEY-remi2023 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-39 -%endif # YUM install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo @@ -187,6 +184,9 @@ mkdir -p %{buildroot}/opt/remi %changelog +* Thu Feb 6 2025 Remi Collet <remi@remirepo.net> - 42-1 +- Fedora 42 using 2025 GPG key + * Thu Jan 16 2025 Remi Collet <remi@remirepo.net> - 40-2, 41-2 - Add 2025 GPG key (Fedora 42 and 43) - re-license spec file to CECILL-2.1 |