[rpms/fedora-repos] f45: Merge modular repos into the main package

[rpms/fedora-repos] f45: Merge modular repos into the main package

[Mohan Boddu]

            A new commit has been pushed.

            Repo   : rpms/fedora-repos
            Branch : f45
            Commit : 7b32bee388d093c446017f1e33309d9b96b24e15
            Author : Mohan Boddu <mboddu@bhujji.com>
            Date   : 2018-07-31T11:30:51-04:00
            Stats  : +15/-27 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-repos/c/7b32bee388d093c446017f1e33309d9b96b24e15?branch=f45

            Log:
            Merge modular repos into the main package
Part of https://fedoraproject.org/wiki/Changes/ModulesForEveryone

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

---
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 4e9c478..0b11a54 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        29
-Release:        0.5%{?_module_build:%{?dist}}
+Release:        0.6%{?_module_build:%{?dist}}
 License:        MIT
 Group:          System Environment/Base
 URL:            https://pagure.io/fedora-repos/
@@ -12,6 +12,8 @@ Requires:       system-release(%{version})
 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
 
 %description
@@ -21,26 +23,12 @@ Fedora package repository files for yum and dnf along with gpg public keys
 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}
 
 %description rawhide
 This package provides the rawhide repo definitions.
 
-%package modular
-Summary:        Modular repo definitions
-Requires:       fedora-repos = %{version}-%{release}
-
-%description modular
-This package provides the modular repo definitions.
-
-%package rawhide-modular
-Summary:        Rawhide modular repo definitions
-Requires:       fedora-repos = %{version}-%{release}
-Requires:       fedora-repos-rawhide = %{version}-%{release}
-
-%description rawhide-modular
-This package provides the rawhide modular repo definitions.
-
-
 
 %package -n fedora-gpg-keys
 Summary:        Fedora RPM keys
@@ -92,26 +80,26 @@ done
 %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 rawhide
-%defattr(-,root,root,-)
-%config(noreplace) /etc/yum.repos.d/fedora-rawhide.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-modular
+%files rawhide
+%defattr(-,root,root,-)
+%config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo
 
+
 %files -n fedora-gpg-keys
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
+
 %changelog
+* Tue Jul 31 2018 Stephen Gallagher <sgallagh@redhat.com> - 29-0.6
+- Merge modular repos into the main package
+- Part of https://fedoraproject.org/wiki/Changes/ModulesForEveryone
+
 * Fri May 18 2018 Mohan Boddu <mboddu@redhat.com> - 29-0.5
 - Baseurl fixes
 

diff --git a/sources b/sources
index fd2edd1..6e516dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora-repos-29.tar.bz2) = b57b911ddbf6b03b7e7f734a29868cd9fbc37333b135a950559560f69652d819a5591bc75842118568fee99c7df53a386a3ac30efdb30264072b53c6d1b10cdb
+SHA512 (fedora-repos-29.tar.bz2) = 3086d45bc6531faf7912ff01a0d451a08b6b2a698c598784a72de48fbd4a2f33c4cbb890f181129420022815ccc6a1f65f94d5471e6ff28621c6f4c3ca949f00