diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | remi-modular.repo | 2 | ||||
| -rw-r--r-- | remi-release.spec | 13 | ||||
| -rw-r--r-- | remi.repo | 2 |
4 files changed, 18 insertions, 5 deletions
@@ -2,13 +2,13 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile +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' -f37: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f37.remi' --define 'fedora 37' - diff --git a/remi-modular.repo b/remi-modular.repo index 6dd5931..144d4f1 100644 --- a/remi-modular.repo +++ b/remi-modular.repo @@ -9,7 +9,7 @@ name=Remi's Modular repository - Fedora $releasever - $basearch mirrorlist=http://cdn.remirepo.net/fedora/$releasever/modular/$basearch/mirror enabled=1 gpgcheck=1 -# can be enabled if not being a proxy because of possible cache issue +# can be enabled if not behind a proxy because of possible cache issue repo_gpgcheck=0 fastestmirror=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever diff --git a/remi-release.spec b/remi-release.spec index b56f918..6654a87 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -10,6 +10,9 @@ Name: remi-release Version: %{fedora} +%if %{fedora} == 40 +Release: 1%{?dist} +%endif %if %{fedora} == 39 Release: 4%{?dist} %endif @@ -47,6 +50,13 @@ Requires: /etc/yum.repos.d Requires: fedora-release >= %{fedora} # For smoth upgrade +%if %{fedora} == 40 +# F40 have ICU 74.2-1 +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 @@ -144,6 +154,9 @@ mkdir -p %{buildroot}/opt/remi %changelog +* Wed Feb 14 2024 Remi Collet <remi@remirepo.net> - 40-1 +- Fedora 40 using 2024 GPG key + * Tue Jan 9 2024 Remi Collet <remi@remirepo.net> - 39-4, 38-5 - Add 2024 GPG key (Fedora 40 and 41) @@ -9,7 +9,7 @@ name=Remi's RPM repository - Fedora $releasever - $basearch mirrorlist=http://cdn.remirepo.net/fedora/$releasever/remi/$basearch/mirror enabled=1 gpgcheck=1 -# can be enabled if not being a proxy because of possible cache issue +# can be enabled if not behind a proxy because of possible cache issue repo_gpgcheck=0 fastestmirror=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever |