[rpms/fedora-repos] f45: Split modular repos to the separate packages

[rpms/fedora-repos] f45: Split modular repos to the separate packages

[Igor Raits]

            A new commit has been pushed.

            Repo   : rpms/fedora-repos
            Branch : f45
            Commit : 007b8f2bd6ce1a094e9daf6d29c3424749bd6e3d
            Author : Igor Raits <ignatenkobrain@fedoraproject.org>
            Date   : 2020-06-29T21:10:53+02:00
            Stats  : +28/-9 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-repos/c/007b8f2bd6ce1a094e9daf6d29c3424749bd6e3d?branch=f45

            Log:
            Split modular repos to the separate packages

Since modular repos do not contain any defaults (and most likely will
not in the near future) and slow-down (even though just a bit) DNF,
there is no point in shipping them on by default. However, anybody who
is interested in them, cam install fedora-repos-modular and get all the
content from there. Those repos are still enabled by default as long as
you have a package installed.

References: https://pagure.io/fesco/issue/2114
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>

---
diff --git a/fedora-repos.spec b/fedora-repos.spec
index f729bcf..25b4b73 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,17 +1,15 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        33
-Release:        0.6%{?_module_build:%{?dist}}
+Release:        0.7%{?_module_build:%{?dist}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
 Provides:       fedora-repos(%{version}) = %{release}
 Requires:       system-release(%{version})
+Obsoletes:      fedora-repos < 33-0.7
 Requires:       fedora-repos-rawhide = %{version}-%{release}
 Requires:       fedora-gpg-keys >= %{version}-%{release}
-Obsoletes:      fedora-repos-anaconda < 22-0.3
-Obsoletes:      fedora-repos-modular < 29-0.6
-Provides:       fedora-repos-modular = %{version}-%{release}
 BuildArch:      noarch
 
 Source1:        archmap
@@ -77,22 +75,36 @@ Source151:      fedora.conf
 Source152:      fedora-compose.conf
 
 %description
-Fedora package repository files for yum and dnf along with gpg public keys
+Fedora package repository files for yum and dnf along with gpg public keys.
+
+%package modular
+Summary:        Fedora modular package repositories
+Requires:       fedora-repos = %{version}-%{release}
+Requires:       fedora-repos-rawhide-modular = %{version}-%{release}
+Obsoletes:      fedora-repos < 33-0.7
+
+%description modular
+This package provides the repo definitions with modular packages.
 
 %package rawhide
 Summary:        Rawhide repo definitions
 Requires:       fedora-repos = %{version}-%{release}
-Obsoletes:      fedora-release-rawhide <= 22-0.3
-Obsoletes:      fedora-repos-rawhide-modular < 29-0.6
-Provides:       fedora-repos-rawhide-modular = %{version}-%{release}
+Obsoletes:      fedora-repos-rawhide < 33-0.7
 
 %description rawhide
 This package provides the rawhide repo definitions.
 
+%package rawhide-modular
+Summary:        Rawhide modular repo definitions
+Requires:       fedora-repos = %{version}-%{release}
+Requires:       fedora-repos-rawhide = %{version}-%{release}
+Obsoletes:      fedora-repos-rawhide < 33-0.7
+
+%description rawhide-modular
+This package provides the rawhide modular repo definitions.
 
 %package -n fedora-gpg-keys
 Summary:        Fedora RPM keys
-Obsoletes:      fedora-release-rawhide <= 22-0.3
 
 %description -n fedora-gpg-keys
 This package provides the RPM signature keys.
@@ -151,12 +163,16 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 %config(noreplace) /etc/yum.repos.d/fedora-cisco-openh264.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing.repo
+
+%files modular
 %config(noreplace) /etc/yum.repos.d/fedora-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-modular.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo
 
 %files rawhide
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
+
+%files rawhide-modular
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
 
 
@@ -171,6 +187,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo
 /etc/ostree/remotes.d/fedora-compose.conf
 
 %changelog
+* Mon Jun 29 21:10:15 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 33-0.7
+- Split modular repos to the separate packages
+
 * Mon Jun 01 2020 Dusty Mabe <dusty@dustymabe.com> - 33-0.6
 - Add fedora compose ostree repo to fedora-repos-ostree