From 26af6a99d7f5429b3932ef8c1cecce84073c8e1f Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Dec 13 2019 20:09:37 +0000
Subject: Add modular repos.


Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>

---

diff --git a/epel-modular.repo b/epel-modular.repo
new file mode 100644
index 0000000..5d4f968
--- /dev/null
+++ b/epel-modular.repo
@@ -0,0 +1,23 @@
+[epel-modular]
+name=Extra Packages for Enterprise Linux Modular $releasever - $basearch
+#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+
+[epel-modular-debuginfo]
+name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug
+#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
+
+[epel-modular-source]
+name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source
+#baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Modular/SRPMS
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
diff --git a/epel-release.spec b/epel-release.spec
index 9710c43..2887c36 100644
--- a/epel-release.spec
+++ b/epel-release.spec
@@ -1,6 +1,6 @@
 Name:           epel-release
 Version:        8
-Release:        7%{dist}
+Release:        8%{dist}
 Summary:        Extra Packages for Enterprise Linux repository configuration
 
 Group:          System Environment/Base
@@ -14,11 +14,14 @@ Source0:        http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8
 Source1:        GPL
 Source2:        epel.repo
 Source3:        epel-testing.repo
-Source4:	epel-playground.repo
+Source4:        epel-playground.repo
 # EPEL default preset policy (borrowed from fedora's 90-default.preset)
 Source5:        90-epel.preset
 Source6:        README-epel-8-packaging.md
 
+Source100:      epel-modular.repo
+Source101:      epel-testing-modular.repo
+
 BuildArch:     noarch
 Requires:      redhat-release >=  %{version}
 # epel-release is only for enterprise linux, not fedora
@@ -46,7 +49,7 @@ install -Dpm 644 %{SOURCE0} \
 
 # yum
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
-install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} \
+install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE100} %{SOURCE101} \
     $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
 install -pm 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-preset/90-epel.preset
 
@@ -61,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/lib/systemd/system-preset/90-epel.preset
 
 %changelog
+* Fri Dec 13 2019 Merlin Mathesius <mmathesi@redhat.com> - 8-8%{dist}
+- Add modular repos.
+
 * Thu Oct 10 2019 Stephen Smoogen <smooge@fedoraproject.org> - 8-7%{dist}
 - Remove failovermethod from EPEL8 tree. It is no longer needed.
 
diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo
new file mode 100644
index 0000000..03fb6ba
--- /dev/null
+++ b/epel-testing-modular.repo
@@ -0,0 +1,23 @@
+[epel-testing-modular]
+name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch
+#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+
+[epel-testing-modular-debuginfo]
+name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug
+#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
+
+[epel-testing-modular-source]
+name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source
+#baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Modular/SRPMS
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1