Updated GPG key and added EL8 support

SOURCES/ELevate.repo

@@ -1,16 +0,0 @@
-# ELevate project repo for el7
-
-[elevate]
-name=ELevate
-baseurl=https://repo.almalinux.org/elevate/el7/$basearch/
-gpgcheck=1
-enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ELevate
-
-## Sources
-[elevate-source]
-name=name=ELevate - Source
-baseurl=https://repo.almalinux.org/elevate/el7/SRPMS/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ELevate

SOURCES/RPM-GPG-KEY-ELevate

@@ -1,5 +1,4 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.22 (GNU/Linux)
 
 mQINBGEf2qUBEACg9gYT++5Fh6xU2g8ebvLwr4UFp/matESHzfQJpbdMYNEgelw7
 XJifeRQ/vx4B5Y0ybxeqHszRENQmC1DNVfky2yh64VtOlAWCkuHbozG0o60VJIrL
@@ -12,40 +11,41 @@ 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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+1x/kPzwx4EmNh7y2VxNUN/5Dy70c4v7BlG6N8QAFrlodYT3NLMQWYWuz2HjYPSJO
-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
+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
-qyl427t4HAZL2Rsc8BMy3g1nuDLgyQqKxbPjAoLRI4BZ/P0jnFwQnUPCKmMQCEeL
+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
-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
+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
-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
+jHFunOKS+ir8qnwA0H4eCSXYRCLcY16R9sHaFmcuHO4Jhi01F9crVEAwbwmfqO7M
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
++mT05zDu+dF4FZNJ9pi74ebnm/yWa8Ln8OpKC2+dPxZTS8Y4SQcgskIAwZFQgNC5
-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
+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
-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
+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
-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
+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
-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
+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
-C7THRDcmB0Y5pzdsl2w2MvcH9DHuIwiCQSVNKwOq5O5PEzILhrB8k4qbUZJq6NPP
+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
-zQbmgyth8xKn27vJ7WwA2GvUTQivswtAvCdcROBLNbqmi9Woj5BUPI4pR1J7iHnz
+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
-JxUSbvV/meEhURqGa6sKgCIt+eH9PLHY5VXsLpjCVJVLaLxDahkFKpXz3GjAuP5B
+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
-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
+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
-biDpD0tLgrYqjIdiyQtbNFuAoKhVHCKvtesE60k76W1hxJTOPKe/yDb9JyZzZgWU
+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
-zZMcuhcz6qqzBK+BT30Oh5oubQnOqsn0AXcAsru4TjTmjM2qL+06kWubeyZBjwaX
+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
-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
+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
-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
+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
-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
+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
-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
+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
-=zvC1
+7y4iRQqp7wbNPr80Z/2aC5FT9KNgWaXOkKlSWOaYQPm8WmV+oz3OQbFmwQ4=
+=1hV9
 -----END PGP PUBLIC KEY BLOCK-----

SPECS/elevate-release.spec

@@ -1,11 +1,10 @@
 Summary: ELevate project packages from the AlmaLinux Migration SIG repository
 Name: elevate-release
 Version: 1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 URL: https://wiki.almalinux.org/sigs/Migration
 Source0: RPM-GPG-KEY-ELevate
-Source1: ELevate.repo
 BuildArch: noarch
 
 %if 0%{?centos} >= 7
@@ -18,10 +17,30 @@ Provides: elevate-release = 1
 
 %description
 yum configuration for ELevate project packages from the AlmaLinux Migration SIG.
+%prep
+
+cat <<EOF > ELevate.repo
+# ELevate project repo for el%{rhel}
+
+[elevate]
+name=ELevate
+baseurl=https://repo.almalinux.org/elevate/el%{rhel}/\$basearch/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ELevate
+
+## Sources
+[elevate-source]
+name=name=ELevate - Source
+baseurl=https://repo.almalinux.org/elevate/el%{rhel}/SRPMS/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ELevate
+EOF
 
 %install
 install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-ELevate
-install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/ELevate.repo
+install -D -m 644 ELevate.repo %{buildroot}%{_sysconfdir}/yum.repos.d/ELevate.repo
 
 %if 0%{?centos} >= 7
 %post
@@ -40,5 +59,9 @@ install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/ELevate.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/ELevate.repo
 
 %changelog
+* Mon Mar 14 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 1.0-2
+- Updated RPM-GPG-KEY-ELevate to match EL9 requirements
+- Added support for EL8
+
 * Tue Sep 28 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 1.0-1
 - Initial version