From 69b7ee59f65ab9241c352da7b25fb7555c1371eb Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Sep 26 2022 22:08:13 +0000
Subject: Move epel-modular repo definitions to epel-modular-release subpackage


---

diff --git a/epel-release.spec b/epel-release.spec
index c33aae0..1a0901c 100644
--- a/epel-release.spec
+++ b/epel-release.spec
@@ -1,6 +1,8 @@
+%bcond_without  modular
+
 Name:           epel-release
 Version:        8
-Release:        17%{dist}
+Release:        18%{dist}
 Summary:        Extra Packages for Enterprise Linux repository configuration
 
 License:        GPLv2
@@ -34,6 +36,9 @@ Conflicts:     fedora-release
 # But only recommend it, incase people do not need crb
 Recommends:    dnf-command(config-manager)
 Recommends:    (epel-next-release if centos-stream-release)
+%if %{with modular}
+Recommends:    epel-modular-release
+%endif
 
 
 %description
@@ -51,6 +56,19 @@ This package contains the Extra Packages for Enterprise Linux (EPEL) Next
 configuration for yum.
 
 
+%if %{with modular}
+%package -n epel-modular-release
+Summary:        Extra Packages for Enterprise Linux Modular repository configuration
+Requires:       %{name} = %{version}-%{release}
+Conflicts:      %{name} < 8-18
+
+
+%description -n epel-modular-release
+This package contains the Extra Packages for Enterprise Linux (EPEL) Modular
+configuration for yum.
+%endif
+
+
 %prep
 %setup -q  -c -T
 install -pm 644 %{SOURCE1} .
@@ -64,8 +82,11 @@ install -Dpm 644 %{SOURCE0} \
 
 # yum
 install -dm 755 %{buildroot}%{_sysconfdir}/yum.repos.d
-install -pm 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE105} %{SOURCE106} \
+install -pm 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} \
     %{buildroot}%{_sysconfdir}/yum.repos.d
+%if %{with modular}
+install -pm 644 %{SOURCE105} %{SOURCE106} %{buildroot}%{_sysconfdir}/yum.repos.d
+%endif
 install -pm 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset
 
 # Add epel crb repo
@@ -85,8 +106,6 @@ fi
 %license GPL
 %config(noreplace) %{_sysconfdir}/yum.repos.d/epel.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-modular.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing-modular.repo
 %{_sysconfdir}/pki/rpm-gpg/*
 %{_prefix}/lib/systemd/system-preset/90-epel.preset
 %{_bindir}/crb
@@ -97,7 +116,17 @@ fi
 %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next-testing.repo
 
 
+%if %{with modular}
+%files -n epel-modular-release
+%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-modular.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing-modular.repo
+%endif
+
+
 %changelog
+* Mon Sep 26 2022 Carl George <carl@george.computer> - 8-18
+- Move epel-modular repo definitions to epel-modular-release subpackage
+
 * Tue Aug 09 2022 Troy Dawson <tdawson@redhat.com> - 8-17
 - Tweak crb script, Recommends dnf-command(config-manager) (#2115602)