#25 Move epel-modular repo definitions to epel-modular-release subpackage
Closed 4 months ago by carlwgeorge. Opened 4 months ago by carlwgeorge.
rpms/ carlwgeorge/epel-release epel8-modular-subpackage  into  epel8

file modified
+33 -4
@@ -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 @@ 

  # 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 @@ 

  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

There is no need for Conflicts here because it Requires an exact version.

+ 

+ 

+ %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 @@ 

  

  # 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 @@ 

  %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 @@ 

  %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)

  

no initial comment

LGTM
Thank you for getting this done.

What are the advantages of doing this again? To make new installs not get modular repos at all? But if we are going to just disable them/remove them, wouldn't that do as well?

Short term this gives users an option to opt-out of the modular repos, similar to fedora-repos-modular.

There is no need for Conflicts here because it Requires an exact version.

We discussed this again at the EPEL Steering Committee meeting. Since the end goal is to EOL epel8-modular, not keep it around as an opt-in/opt-out, we agreed that just setting enabled=0 is a better intermediate step than moving the repo definitions to a subpackage. That has been implemented in #26.

Pull-Request has been closed by carlwgeorge

4 months ago
Metadata