From d9f880af9e29f17eb1b410c78e12915fa962d7d3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 10 Feb 2022 12:09:28 +0100 Subject: Fedora 36 using 2022 GPG key --- Makefile | 4 ++-- RPM-GPG-KEY-remi2022 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ remi-release.spec | 23 ++++++++++++++--------- 3 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 RPM-GPG-KEY-remi2022 diff --git a/Makefile b/Makefile index c276ea3..b07a2e4 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ f35: f34: rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f34.remi' --define 'fedora 34' -f33: - rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f33.remi' --define 'fedora 33' +f36: + rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f36.remi' --define 'fedora 36' diff --git a/RPM-GPG-KEY-remi2022 b/RPM-GPG-KEY-remi2022 new file mode 100644 index 0000000..2e00f42 --- /dev/null +++ b/RPM-GPG-KEY-remi2022 @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=K8Wh +-----END PGP PUBLIC KEY BLOCK----- diff --git a/remi-release.spec b/remi-release.spec index 614b77f..67ea4ab 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -1,6 +1,6 @@ # remirepo spec file for remi-release (Fedora) # -# Copyright (c) 2006-2021 Remi Collet +# Copyright (c) 2006-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,14 +10,14 @@ Name: remi-release Version: %{fedora} +%if %{fedora} == 36 +Release: 1%{?dist} +%endif %if %{fedora} == 35 -Release: 3%{?dist} +Release: 4%{?dist} %endif %if %{fedora} == 34 -Release: 6%{?dist} -%endif -%if %{fedora} == 33 -Release: 6%{?dist} +Release: 7%{?dist} %endif Summary: Configuration for remi repository Summary(fr): Configuration pour le dépôt remi @@ -42,6 +42,7 @@ Source2018: RPM-GPG-KEY-remi2018 Source2019: RPM-GPG-KEY-remi2019 Source2020: RPM-GPG-KEY-remi2020 Source2021: RPM-GPG-KEY-remi2021 +Source2022: RPM-GPG-KEY-remi2022 BuildArch: noarch @@ -106,16 +107,17 @@ install -Dp -m 644 %{SOURCE2018} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- install -Dp -m 644 %{SOURCE2019} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2019 install -Dp -m 644 %{SOURCE2020} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2020 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 +%if %{fedora} <= 36 +ln -s RPM-GPG-KEY-remi2022 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-36 +%endif %if %{fedora} <= 35 ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-35 %endif %if %{fedora} <= 34 ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-34 %endif -%if %{fedora} <= 33 -ln -s RPM-GPG-KEY-remi2020 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-33 -%endif # YUM install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo @@ -143,6 +145,9 @@ install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debugi %changelog +* Thu Feb 10 2022 Remi Collet - 36-1, 35-4, 34-7 +- Fedora 36 using 2022 GPG key + * Tue Nov 30 2021 Remi Collet - 34-6, 35-3 - add remi-modular-debuginfo and remi-modular-test-debuginfo repository configurations -- cgit