summaryrefslogtreecommitdiffstats
path: root/remi-release.spec
diff options
context:
space:
mode:
Diffstat (limited to 'remi-release.spec')
-rw-r--r--remi-release.spec34
1 files changed, 13 insertions, 21 deletions
diff --git a/remi-release.spec b/remi-release.spec
index b08d84a..6642ce8 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -1,6 +1,6 @@
# remirepo spec file for remi-release (Fedora)
#
-# SPDX-FileCopyrightText: Copyright 2006-2025 Remi Collet
+# SPDX-FileCopyrightText: Copyright 2006-2026 Remi Collet
# SPDX-License-Identifier: CECILL-2.1
# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
@@ -11,15 +11,9 @@
Name: remi-release
Version: %{fedora}
%if %{fedora} == 43
-Release: 1%{?dist}
-%endif
-%if %{fedora} == 42
-Release: 1%{?dist}
-%endif
-%if %{fedora} == 41
Release: 2%{?dist}
%endif
-%if %{fedora} == 40
+%if %{fedora} == 42
Release: 2%{?dist}
%endif
Summary: Configuration for remi repository
@@ -47,6 +41,7 @@ Source2022: RPM-GPG-KEY-remi2022
Source2023: RPM-GPG-KEY-remi2023
Source2024: RPM-GPG-KEY-remi2024
Source2025: RPM-GPG-KEY-remi2025
+Source2026: RPM-GPG-KEY-remi2026
BuildArch: noarch
@@ -68,13 +63,6 @@ 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
%description
@@ -150,19 +138,20 @@ install -Dp -m 644 %{SOURCE2022} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-
install -Dp -m 644 %{SOURCE2023} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2023
install -Dp -m 644 %{SOURCE2024} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2024
install -Dp -m 644 %{SOURCE2025} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2025
+install -Dp -m 644 %{SOURCE2026} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2026
+%if %{fedora} <= 45
+ln -s RPM-GPG-KEY-remi2026 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-45
+%endif
+%if %{fedora} <= 44
+ln -s RPM-GPG-KEY-remi2026 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-44
+%endif
%if %{fedora} <= 43
ln -s RPM-GPG-KEY-remi2025 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-43
%endif
%if %{fedora} <= 42
ln -s RPM-GPG-KEY-remi2025 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-42
%endif
-%if %{fedora} <= 41
-ln -s RPM-GPG-KEY-remi2024 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-41
-%endif
-%if %{fedora} <= 40
-ln -s RPM-GPG-KEY-remi2024 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-40
-%endif
# YUM
install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo
@@ -194,6 +183,9 @@ mkdir -p %{buildroot}/opt/remi
%changelog
+* Tue Jan 6 2026 Remi Collet <remi@remirepo.net> - 42-2, 43-2
+- Add 2026 GPG key (Fedora 44 and 45)
+
* Mon Sep 1 2025 Remi Collet <remi@remirepo.net> - 43-1
- Fedora 43 using 2025 GPG key