Add 2024 GPG key (Fedora 40 and 41)

2 files changed, 66 insertions, 17 deletions

diff --git a/RPM-GPG-KEY-remi2024 b/RPM-GPG-KEY-remi2024
new file mode 100644
index 0000000..fe82d62
--- /dev/null
+++ b/RPM-GPG-KEY-remi2024
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGWdEG0BEADV9c8aSIITQmoWKN0ac4c8AEhZcdzpWSRPwHIS8syVRw/gj30W
+Mn1OoxqFn2UECh2jjqYaQFECXNrM2/lzO4GhvcuoPn6p0rXFMvYvwtiOJ+rmDvTe
+UOwRxkZhYehpvsRPFoVhlYJh3U1BM0UHm2iE/TIqVusY9FHQuCMZVl0BHk81YGDa
+qE3cyu+9zOs8z1bYlsYBgLIbtb4+loQTRexFTfZkUcCWgAaNyur8Wy7Msdm5LOqN
+ZZu6bNKBOv0Cr+BOwGNoFRbi4IM+5H+0eI1n7V5if4CuXfdYHp+Pm+PQvftm/nqB
+jRLKqioRKzHjk7xNMsi5lM+SU4WyfU77pr3RXuJR6fkymLVAeu5sy2U6ySj0SXIO
+/I3oPp4/zJ8/e94jG5iDqh92b5IWyXSE+EGw4kkpUvZLrK8vyyEfk8h9Gf8qA5uL
+yGfw0vnSVjYb+RdnfZFVdPaIEmeY8tnobS87duj8JESZiSWo5sU4filkciW5e+MJ
+w9wohgl+Cqm2J5Ljqus6DRm4ptKbZD8QZRnmGcSk6O2VopBKt2XLat4eIJLr/EiN
+0CJ1EH/oJmEeZbYtUjxjsGsbPXicwDH6ZIeIMSaiDgqRxPm1LTGVLjSHAk+k0e5l
+ulEmaoA7t/p3U2peGc7ONvozXiyNHZdGiRkqFC1mA9/JpeWw4KFH6JSgmQARAQAB
+tEtSZW1pJ3MgUlBNIHJlcG9zaXRvcnkgMjAyNCAoaHR0cHM6Ly9ycG1zLnJlbWly
+ZXBvLm5ldC8pIDxyZW1pQHJlbWlyZXBvLm5ldD6JAlEEEwEIADsWIQTPHfAFfOhd
+/1svKjfC/TssKglI5AUCZZ0QbQIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIX
+gAAKCRDC/TssKglI5Na7EACDTGjTcuTyudfuu/JC41BSurclCcwZyPsGaClyc0qx
+Tk8Rs4rbyVw1u494fiFG/yEVl7LGGja84UJOlMdw82KgVUmr4fGLaBBFWm+KnZ4W
+4vvFcCIxUshENOaDrkhby9F5P379gVOK9I3n9l4Q2xt+sWUNwE74CNfCTUeYMIm/
+/AHbb1DTM9FuIT6FssgvILMTlksiyrw8U8bj+QUzPZrFCpvv+PnFA7ZDMEyCf2Tz
+/zawxoP3a3b+3/g61U9SVIkfToonnorqh9lkQYhsdKTFHW6eESqe7zcqMBZv/sSc
+3kFzl22KczSdU8eYxdujv9BmlW2SOrQsnuMYxvoD1LzhwSB/nOapNrWU+djhJCof
+ueZ+rBW4QWysmG0dEp5Wpz85TstAnQ+j5aCOMSAkiAVsrJ0Ff3JXakIiL7rEtccS
+dhgBT06LJtJy1NGIC0Sotn45n6dtfi6IuI8LnELCKeHxhdFSJcAPB8y95u0uHymy
+sqMfzjq1VcYtzC5II6Yd5Gtb2+QzyQwORslwXhUdXwZKUc5i6X5xFMSxU523fH9n
+i+kQlUTPkOUr66v4fmYDj+ZlJQSFoPylcHCke/vOo/rH5nj+YMPa6LdohsdzHKpd
+DkKrk+Udj5aDXtXGIFYwoNKO4BnCsz/ImZfB4CQ+ekJsY1pFill3+MRTM6IvSA+P
+7LkCDQRlnRBtARAAq8k4FM9euMMsXz0buxxyr0ew0ecWNhZGy24a6DXORVTEJbgI
+T3HpV/C2PWkwgEBswYzREm+en61jhWr5unCiytO2klT+K2WNcIUNW+z2ciL/JNaJ
+OcKwjkiY/A+KtDStzllCQ/XnpgAXGvFZjMjhHrNGQoAwNnPE/cMtYwcuVdW3Ipm3
+cOOtzxRmfnhP8YUEyHxdos/7AZowaiLIUkaL5RUaygGrfPGyUXPl1aXS1oiOm37W
+RiKCGUxCHSlpBqeh1WQPOaps8y+ME9jMzF9SLvqiXlKPllJIx9i8tHUOnX6Y2U2x
+5sXsCEiA+zNVMU3YQ04++Yx2Rp6sDhNEnAbTCqqequqIzaXHZWwszAeG6pj1G90m
+8PwDeHy641ySgDMwVPpnH5rHWmmT96XvF9QNg07OBtW9/phryzwAuHogrBY4DyFD
+pUxDkTv9TxfBaS/s1uJxEGknIgnKzQo79mRy206waGKRA2AV36ORSfU12sK8pl3r
+N95iIDh/OIuMl2STaXilhwb1hRpGFvwRlq3Hvvan4SY1aO219Q+VxMGXeqC5F/rm
+Anh7mRVMP2qu0rj7L8xJ/OD/bPfuWL72/PvviBr/jdRM9I+Vj8dPGjhUwhK1dpEG
+Q6yvoVXLHXucVHfIVR+ALLBmK8oHXNIFeIXhiUbgmRAilPHRz6Rf5pgbrC0AEQEA
+AYkCNgQYAQgAIBYhBM8d8AV86F3/Wy8qN8L9OywqCUjkBQJlnRBtAhsMAAoJEML9
+OywqCUjkQ2kP/iwqvt1sX85KM4OSE9ftqemwnvh19NizMKHMYGgikMAvy2CndEOI
+wzKVeE1iK9/ivZQQIbD5l0G9hzVZjIxbgu9dAcxM+jdmaPyUj7yn6AX2yeGAeHyA
+qzNKZaTLJPieRzdXk/uKPVyWUuzbR0vwR7n8N5N0pe/FEfO9O0uX5iz2kf5+b10c
+WqvzLmO+czuyCjTHnjhKfE73iIktYE3MnM8qFHPiKwm+jeTkUnmInoR3qIKR/SCV
+u2vk/q5uvpNaUSPSDKji6wh3/hbNbPocLSGIjugfWNm/4LhlSHPNnRJ2dIvSxeiI
+qtSWxhULEyHGBPMLDriVumCV7Rb/byJwiMbmCIpxB5XLtbgt7nIqWQTko+6ci71S
+4rDXolM3bytYbpqq4b/Xc1bhBuTX3omwrd0kxmGqad8eia6O6iBsP7GAl4QkySm4
+MfKQfohjXTnT60wqEzQwLGI4NKN9bHRSsGINHX5p+Kz9HLf87fTY4uglbFxg0/II
+Y3nko5KBw/gfe0WpwZY0sWjK20cXJn3xLQjoG8OjUNUCUYTRsiAvn4AiDRt++qtl
+bvJjJqOU1k4GrGoCVpEUiOc9Cw1YZREcFe8H2at3pGnxJ1DFlYA916kNAxYANp2s
+r3N3agwevgIzP78hynxjm6a5H2w0vkg189pZn2RR9zX9gmrvlqg1o0P1
+=meaU
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/remi-release.spec b/remi-release.spec
index 0ee1fbd..b56f918 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for remi-release (Fedora)
 #
-# Copyright (c) 2006-2023 Remi Collet
+# Copyright (c) 2006-2024 Remi Collet
 # License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -11,13 +11,10 @@
 Name:           remi-release
 Version:        %{fedora}
 %if %{fedora} == 39
-Release:        3%{?dist}
-%endif
-%if %{fedora} == 38
 Release:        4%{?dist}
 %endif
-%if %{fedora} == 37
-Release:        3%{?dist}
+%if %{fedora} == 38
+Release:        5%{?dist}
 %endif
 Summary:        Configuration for remi repository
 Summary(fr):	Configuration pour le dépôt remi
@@ -42,6 +39,7 @@ Source2020:     RPM-GPG-KEY-remi2020
 Source2021:     RPM-GPG-KEY-remi2021
 Source2022:     RPM-GPG-KEY-remi2022
 Source2023:     RPM-GPG-KEY-remi2023
+Source2024:     RPM-GPG-KEY-remi2024
 
 BuildArch:      noarch
 
@@ -64,14 +62,6 @@ Obsoletes:      libicu72       < 72.2
 Obsoletes:      libicu72-devel < 72.2
 Obsoletes:      libicu72-doc   < 72.2
 %endif
-%if %{fedora} == 37
-# Only F37 have ICU 71.1-2
-# libicu71: remi has 71.1-2, F38+ has 71.1-2
-Obsoletes:      icu71          < 71.2
-Obsoletes:      libicu71       < 71.2
-Obsoletes:      libicu71-devel < 71.2
-Obsoletes:      libicu71-doc   < 71.2
-%endif
 
 %description
 This package contains %{pkgman} configuration for the "remi" RPM Repository,
@@ -120,16 +110,20 @@ install -Dp -m 644 %{SOURCE2020} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-
 install -Dp -m 644 %{SOURCE2021} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2021
 install -Dp -m 644 %{SOURCE2022} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2022
 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
 
+%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
 %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
-%if %{fedora} <= 37
-ln -s RPM-GPG-KEY-remi2022  %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-37
-%endif
 
 # YUM
 install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo
@@ -150,6 +144,9 @@ mkdir -p %{buildroot}/opt/remi
 
 
 %changelog
+* Tue Jan  9 2024 Remi Collet <remi@remirepo.net> - 39-4, 38-5
+- Add 2024 GPG key (Fedora 40 and 41)
+
 * Wed Dec 20 2023 Remi Collet <remi@remirepo.net> - 39-3, 38-4
 - disable repo_gpgcheck as it raise too much issue being proxy
   and CVE-2021-20271 is fixed in rpm