From fc7b111f4aceeacd1215026739ffde43987ad1cf Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Mon, 21 Apr 2025 14:13:14 +0300
Subject: [PATCH] - Rename to epel-release-almalinux-altarch - Replace GPG key
 with AlmaLinux one - Use AlmaLinux repository URLs for x86_64_v2 architecture
 - Remove testing repository

---
 RPM-GPG-KEY-AlmaLinux-10-EPEL-AltArch | 29 +++++++++++++++++++++
 RPM-GPG-KEY-EPEL-10                   | 29 ---------------------
 epel-release.spec                     | 19 +++++++++-----
 epel-testing.repo                     | 36 ---------------------------
 epel.repo                             | 30 +++++++++-------------
 sources                               |  0
 6 files changed, 54 insertions(+), 89 deletions(-)
 create mode 100644 RPM-GPG-KEY-AlmaLinux-10-EPEL-AltArch
 delete mode 100644 RPM-GPG-KEY-EPEL-10
 delete mode 100644 epel-testing.repo
 create mode 100644 sources

diff --git a/RPM-GPG-KEY-AlmaLinux-10-EPEL-AltArch b/RPM-GPG-KEY-AlmaLinux-10-EPEL-AltArch
new file mode 100644
index 0000000..1bb8126
--- /dev/null
+++ b/RPM-GPG-KEY-AlmaLinux-10-EPEL-AltArch
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGfqxjEBEADUuuNdEdEGVYquPx5yCpJXs+tQEhWAwjwEwfo1hRjmdQkvWceI
+r+Dh+hPBWhJbklXkK3oKUuOepPwT4KBASAFRu4ReGQSlxQDfDfazN6TSmpQPj7mX
+9zGg68EirhzluqORv/qfhvW6V6EhXeeRa4Wr84dc8cLmQ6r+L28v7pzIbC2zQsbe
+3te3MU1yQmJDwcYMD+5hCHam05KFAF2qktUiq1IOIvScy1SN1+1vhP89DuLftPyd
+qmtDC/aN0VfXa7NPecVYchfkMOrFqISGLLP718pSaepuESPdNguTi+Y/8i+NScAJ
+ov4OSOv3VoP0bQPrqxkJLZiVbOEQdR268upgGBfXjf5+hUrPTCJkb3MZLgSGeeyK
+vCHJ6V0LSTIHtTBJhG1vT5B9AF4XThsd6EHscwCid/fdgrebgwz0CD3SkroqH+xL
+LCR/eGV7psGqCjoVB/hIq6I8OmSOYsRmAbb2fVVSQI1Ar+mhH2D0gzSpVh8inRca
+RlGcAVzAgvIa5eNu1tRIDP+lyZTR0YdPpMGHCWIg1PtBHNDCFLvYRddGiQJzS+SZ
+5TgE4oi7K0HEt0V2YwQSbji3BtP8tVInNQstDvOkOb1eVTb6to6U7RXtBvBetLBp
+ez0ixVXQi6jlswUmBXIcebbDTaO+7q4fE4bqRzafHmHlsxV+xy263eYYwwARAQAB
+tDJBbG1hTGludXggRVBFTCAxMCBBbHRBcmNoIDxwYWNrYWdlckBhbG1hbGludXgu
+b3JnPokCTAQTAQoANhYhBGjdE3t2kPRzUZfEsbYgwCM11EemBQJn6sYxAhsDBAsJ
+CAcEFQoJCAUWAgMBAAIeBQIXgAAKCRC2IMAjNdRHpsRHEACGA5Fse8ieJBgpbdPi
+VytlGSTTxvecNrbA5j7WDMk2qbJZdBgBW7bboJ55Klk20Wyug5IURu7A6DABdIkf
+8HHmUD3eLRN9UxOo4bhiovuMSclGac8g7LoL6GI+JdWKVoBH7uUAijrq+yhG8nGB
+vHAucPts+uZHDAyPryu+G+aws+LOkicFcR2pUKJQ8MS4UGHMm0S7623AyHPOhPu/
+UvZ3snszfjfNDpDj07bxoL/ZrkCN5xcsDWtc1niwvZMN7aTxFm0pfhYyILFIZo8s
+Y1OKIvrbcs/K7DEOk8POp8zRzcTbYKGlkrtqOzeW7qHhYw2p1P9/oNRUh1RKXKSB
+eKtSOovPCewTBkczp50wOQZt7fUJtJ1+hbWUL6HaB0Bn0yCXr4vjD9ySDGjcH/pa
+sNukyG04WVB1YOZGmcUOaiftCWNJVOqC0tLl6RL0+JjkKSQ3nPZnxBY8/BjR/UNL
+0KfdQT+WfBUJ7CJ4O2eXtKI9uKtuqMDSJszYC69F+GrAZZXWT7OzrLbiIctAyA+y
+UmAJJMncEQDE+T+eWa92E5f9y9xVanTV/FTWou7pjdwXol7imCaycoGGHIrxGEJo
+32xamBEhmYnvYWyNu9t7ftTj8rAIbVpMZEsOA3BQqqGHsse9GfVGsYijrhE3NsTj
+mg5Eb5/Z0DNji/xjvk9XN37h2w==
+=JwG4
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-EPEL-10 b/RPM-GPG-KEY-EPEL-10
deleted file mode 100644
index adf4f88..0000000
--- a/RPM-GPG-KEY-EPEL-10
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGV4X6kBEAC3eQxgiWuo08uc3mHo4ELux++uqTnYz/tJzEf9Ou3h36WnhumA
-Nvs+Ts5h8PBx879Y9/aIX1Z20p1kf6tBCinZnEJu59n+TAAsph0+XQlV1l5YkleK
-Z2ff/Fg65k8QcLXWaIGykA/FaKznRiSurGuD6tRGhJw7DawEwBJr8QZSkRUpnH1L
-URW97Q/iKrRPiE5VEayE0y8eAL28jIIiFvR+4oJMzvCsRRB/2wYZ2MlJOW91hcYf
-mbUoXKOBD5UzsJylu7kj25K/ge8rEJ7KicOOwcdYddxsU3DxGSSfwF8AMagENcm2
-XROeXknjm84A8sNlUkFZBJwfuc7eRTiZGJrnQQVYLrkKj8Mxpq9Ts7hU51TqAWNI
-uvGDlJdYNE3D2RMqjMEsZ8ej08Thrib6xslu4NzTBkt+6QNnXL4E3hEgYtoyio60
-GswSz2ulogKg7X4JrNdJYE8/qNowyF3hoVgj5TG1/wQRq+5HlMMOLjgGu9wzLUix
-fnVfEUnzaofbrUf4/GabCaeY8xRe4tFQrvzigQ4g+kgwKKnfAeqBmPov0yljkw9z
-BYJWR5zvaw0ffg9Ing00KUSaXBXA5jSlgk1603Y+LefY1SlXsTyqohiRvGH6FI77
-HNMo72DwoJfFcYjncZUzKgXWJECR4nhVsdj6pKoOjcQ4aSuyVxtsR86ASQARAQAB
-tChGZWRvcmEgKGVwZWwxMCkgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQJOBBMB
-CAA4FiEEfY0Vy/xOYmiFkfsmM9mFF+N+0VgFAmV4X6kCGw8FCwkIBwIGFQoJCAsC
-BBYCAwECHgECF4AACgkQM9mFF+N+0Vhv/A/+PlhPLSctGRCUEahE+cN4764Acc3p
-l40ZYzXRhqR0/Tc1/cSDjlA3qVTc8SPohi5OJXwCyr9EiMqKoyoDN097euqbYpyp
-yN/Pj0lBjsXwcpdDtZ21WGeQU0Khb04N68bMtJbDaxeBciTvDDQravZuPPh0m4Rg
-Z6myEoa6Aa6EK0hI1Qwi1qIWeRiuEkVT671IaKVETBW5XiUpNBXDAB/L+6DzUF9u
-scBzfsUDiPO6NrpYDtV3jwq22y6gWluIct/Ka8brwPbqK2sBfFzrHboRhfqlTGjs
-7F9qUGwIQZn/A8iozXZYQ0+JG1bhQyvjA8eN1GOcRpT+O7H7JXN49o6IG2As4+iK
-F04+qjqAu2sVfpD8mzM2VubFNllcKKiyCzRYHhSbObRCPzsudDL9GPiXeGGaCuWg
-sDkiA1MESvf2tLETAGBs/TziO4GwmXUtlKbRiq1FYm90mVq9mBxPZ/Idn+yZusNB
-0O5SXIbI8lYZw5n4XTK4b+byHRBYsOTHiTsGvjTF2Y7oSwW2CVUmL6RZ23mI4qoY
-1p5kzRS+GjT1acnTei/FTsOlIKCsjfeHx7uxCkX6xpAD8P3UtLQqfsgH0CL4vSZt
-TGO6L1InQlp4ZG3OYIomTKbD3/R0wod3U3dTqdulQMXL895u6OLTY3spY2m2MO2k
-p9Dfd2pKuxK9Mys=
-=mhQZ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/epel-release.spec b/epel-release.spec
index d78d98a..900a01c 100644
--- a/epel-release.spec
+++ b/epel-release.spec
@@ -8,7 +8,7 @@
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
 ## END: Set by rpmautospec
 
-Name:           epel-release
+Name:           epel-release-almalinux-altarch
 Version:        10
 Release:        %autorelease
 Summary:        Extra Packages for Enterprise Linux repository configuration
@@ -23,11 +23,10 @@ BuildArch:      noarch
 URL:            https://epel.io
 
 # keys
-Source10:       https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-%{version}
+Source10:       https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux-10-EPEL-AltArch
 
 # repo configs
 Source20:       epel.repo
-Source21:       epel-testing.repo
 
 # preset policy
 Source30:       90-epel.preset
@@ -45,6 +44,9 @@ Recommends:     dnf-command(config-manager)
 # SELinux policy modules related to EPEL
 Recommends:     (selinux-policy-epel if selinux-policy)
 
+Conflicts:      epel-release
+Provides:       epel-release = %{version}-%{release}
+
 %description
 This package contains the Extra Packages for Enterprise Linux (EPEL) repository
 configuration and GPG key.
@@ -60,7 +62,7 @@ install -pm 644 %{SOURCE32} .
 install -Dp -m 0644 -t %{buildroot}%{_sysconfdir}/pki/rpm-gpg %{S:10}
 
 # repo configs
-install -Dp -m 0644 -t %{buildroot}%{_sysconfdir}/yum.repos.d %{S:20} %{S:21}
+install -Dp -m 0644 -t %{buildroot}%{_sysconfdir}/yum.repos.d %{S:20}
 
 # preset policy
 install -Dp -m 0644 -t %{buildroot}%{_prefix}/lib/systemd/system-preset %{S:30}
@@ -80,15 +82,20 @@ fi
 
 %files
 %license GPL-2.0-only.txt
-%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version}
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-%{version}-EPEL-AltArch
 %config(noreplace) %{_sysconfdir}/yum.repos.d/epel.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing.repo
 %{_prefix}/lib/systemd/system-preset/90-epel.preset
 %{_bindir}/crb
 
 
 %changelog
 ## START: Generated by rpmautospec
+* Mon Apr 21 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10-5
+- Rename to epel-release-almalinux-altarch
+- Replace GPG key with AlmaLinux one
+- Use AlmaLinux repository URLs for x86_64_v2 architecture
+- Remove testing repository
+
 * Thu Apr 03 2025 Carl George <carlwgeorge@fedoraproject.org> - 10-5
 - Change metalinks/baseurls to new repo naming scheme
 
diff --git a/epel-testing.repo b/epel-testing.repo
deleted file mode 100644
index 8335438..0000000
--- a/epel-testing.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[epel-testing]
-name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/testing/$releasever${releasever_minor:+z}/Everything/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-testing-$releasever&arch=$basearch
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=24h
-countme=1
-enabled=0
-
-[epel-testing-debuginfo]
-name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/testing/$releasever${releasever_minor:+z}/Everything/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-testing-debug-$releasever&arch=$basearch
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=24h
-enabled=0
-
-[epel-testing-source]
-name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/testing/$releasever${releasever_minor:+z}/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-testing-source-$releasever&arch=source
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=24h
-enabled=0
diff --git a/epel.repo b/epel.repo
index f186dbd..2afce2e 100644
--- a/epel.repo
+++ b/epel.repo
@@ -1,10 +1,8 @@
 [epel]
-name=Extra Packages for Enterprise Linux $releasever - $basearch
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/$releasever${releasever_minor:+z}/Everything/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-$releasever&arch=$basearch
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
+name=Extra Packages for Enterprise Linux $releasever from AlmaLinux - x86_64_v2
+# mirrorlist=https://epel.mirrors.almalinux.org/mirrorlist/$releasever${releasever_minor:+z}/epel?arch=x86_64_v2
+baseurl=https://epel.repo.almalinux.org/$releasever${releasever_minor:+z}/x86_64_v2/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever_major-EPEL-AltArch
 gpgcheck=1
 repo_gpgcheck=0
 metadata_expire=24h
@@ -12,24 +10,20 @@ countme=1
 enabled=1
 
 [epel-debuginfo]
-name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/$releasever${releasever_minor:+z}/Everything/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-debug-$releasever&arch=$basearch
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
+name=Extra Packages for Enterprise Linux $releasever from AlmaLinux - x86_64_v2 - Debug
+# mirrorlist=https://epel.mirrors.almalinux.org/mirrorlist/$releasever${releasever_minor:+z}/epel-debuginfo?arch=x86_64_v2
+baseurl=https://epel.vault.almalinux.org/$releasever${releasever_minor:+z}/debug/x86_64_v2/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever_major-EPEL-AltArch
 gpgcheck=1
 repo_gpgcheck=0
 metadata_expire=24h
 enabled=0
 
 [epel-source]
-name=Extra Packages for Enterprise Linux $releasever - $basearch - Source
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/$releasever${releasever_minor:+z}/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-source-$releasever&arch=source
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
+name=Extra Packages for Enterprise Linux $releasever from AlmaLinux - x86_64_v2 - Source
+# mirrorlist=https://epel.mirrors.almalinux.org/mirrorlist/$releasever${releasever_minor:+z}/epel-source?arch=x86_64_v2
+baseurl=https://epel.vault.almalinux.org/$releasever${releasever_minor:+z}/Source/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-$releasever_major-EPEL-AltArch
 gpgcheck=1
 repo_gpgcheck=0
 metadata_expire=24h
diff --git a/sources b/sources
new file mode 100644
index 0000000..e69de29