Add 2026 GPG key (Fedora 44 and 45)HEADmaster

3 files changed, 27 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 7dd1519..5277553 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,6 @@ SRCDIR := $(shell pwd)
 NAME := $(shell basename $(SRCDIR))
 include ../common/Makefile
 
-f41:
-	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f41.remi' --define 'fedora 41'
-
 f42:
 	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f42.remi' --define 'fedora 42'
 
diff --git a/RPM-GPG-KEY-remi2026 b/RPM-GPG-KEY-remi2026
new file mode 100644
index 0000000..bf1f997
--- /dev/null
+++ b/RPM-GPG-KEY-remi2026
@@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaVvVNRYJKwYBBAHaRw8BAQdAyl5nvgTB0ltjibD6ytZuueCfK5BckaBtvmwe
+EHBgNOy0S1JlbWkncyBSUE0gcmVwb3NpdG9yeSAyMDI2IChodHRwczovL3JwbXMu
+cmVtaXJlcG8ubmV0LykgPHJlbWlAcmVtaXJlcG8ubmV0PoiTBBMWCgA7FiEELjdf
+4k7f8PLg2OFl7VtYxb76AOIFAmlb1TUCGwMFCwkIBwICIgIGFQoJCAsCBBYCAwEC
+HgcCF4AACgkQ7VtYxb76AOL0RQD+MgzPi0GSjthi35XNb+BIv0eiFs4NrEfqg9ZR
+LEbla5QBALyrubRo/Fs3eznUwtBk9SBwQ44SpqbR/csWW9Np0ncGuDgEaVvVNRIK
+KwYBBAGXVQEFAQEHQEKUBzKz/9/aIZBK6e08jLaYHim3toNboKOxBRhc2fQ2AwEI
+B4h4BBgWCgAgFiEELjdf4k7f8PLg2OFl7VtYxb76AOIFAmlb1TUCGwwACgkQ7VtY
+xb76AOJwNwEA3M1fXk5/bV9YDJkN+9XDE14MYfwA9P2jqrpdha2PQvgBAJa8qal+
+0/4GrbanezVjAgzQM5wifcb5zlw/GJWXA8sE
+=B2jA
+-----END PGP PUBLIC KEY BLOCK-----
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