[rpms/fedora-repos] f45: Drop fedora-repos-modular and fedora-repos-rawhide-modular packages

            A new commit has been pushed.

            Repo   : rpms/fedora-repos
            Branch : f45
            Commit : 00b35f8d4288e7f4360992a47da43a8d2d96fe7b
            Author : Miro Hrončok <miro@hroncok.cz>
            Date   : 2023-07-10T17:54:56+02:00
            Stats  : +21/-244 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-repos/c/00b35f8d4288e7f4360992a47da43a8d2d96fe7b?branch=f45

            Log:
            Drop fedora-repos-modular and fedora-repos-rawhide-modular packages

https://fedoraproject.org/wiki/Changes/RetireModularity

---
diff --git a/RPM-GPG-KEY-fedora-modularity b/RPM-GPG-KEY-fedora-modularity
deleted file mode 100644
index 99b0291..0000000
--- a/RPM-GPG-KEY-fedora-modularity
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFkbN5MBEAC9zjfb8joJxrX0eawhKizSZlKnAaNXhGeg5NauRy2t34BVosbO
-e1z5tohrV7OAhB1X97ZkrsKg0ENTwlTYn/DI/bTU0Z+OG/bp7Fj07jMuYEcobKCq
-5BkspPaW9pHZ/Z070ZZxPpccWvGt1WD/KIno1J98Hszh+KvpDOW9voLdOc0KBvrw
-gZuAUB53Cjljeb6x871IFjF0UgvuPlklF7GlOU8mN9OoMDGUU8lr9qhYSkdFz9Us
-NyHLWDi3ySHYWF7L7NdOKE+5j1emy1kNt5gaTr6XTPOhfvq8VZHZA/AXLRGB9TkQ
-W6/VNzBbiEV7GT6ypDjHQ0ir0N+M0CZtOOBEIwToDWj/8pSO+onT/ChCxO0o0o96
-zjKPcPocxlVZE31klARMsHfG8Oi6uw1oHEfQH60yZYwCdA2GRu3OK6N/t/tqXH96
-WfOh2AjPiHvYf8Wuli1l2OMGj7Uzo6oxuS4nzB1zz4G1KEGDZbned0o65fcxi0+4
-B8pAvnucBI+AE78HaR9/ehAsI2P7KMP6WiKPO5BfELq2wC4bWaZbROqUuGgQ6wwK
-4C6oP27ug9n/ce5GlHTPNenAeC8rtUGCWv+2XayHdAG4rHB5VLDywyD+/6bwhVM4
-gPIzKkm7exR+mylwsNiXl7gwBgdNdal4p2rY0hJuLwsx4lLFHXFVjFRtxwARAQAB
-tEhNb2R1bGFyIEZlZG9yYSAoZmVkb3JhLW1vZHVsYXJpdHkpIDxmZWRvcmEtbW9k
-dWxhcml0eUBmZWRvcmFwcm9qZWN0Lm9yZz6JAj4EEwECACgFAlkbN5MCGw8FCSis
-we0GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEFvBtSejzE5i6f8P/1AeJgzC
-GDBFKE2RLlZXtqDv+khlBeSVVRrfLyiJNjEnUFq6X6XhDDb8ldZq4JpUB0sy8Eux
-NBef3n1Yw67XY5ZWOdDgo+ci2yeog7Ch5Hv59jvwpwnOnsc8/JOUwAz4EkxjloUh
-YV3afXKFOM15HAKFRJ/OerKQSy0KWHsd9KWIgBEOb5FAwrH86n3zLuuAUnjsiE7V
-kXh2zxehuD+rv35u17CL3H5R3tO3V1xzw4oAMoIspuJxipBB2+nXN6A1iFw1yQA8
-5g91tUmJ+6jwLYpNhhgqkPCy/3j05Ut+hyP2TfVushGfwphXc3cg8UWbRA1OgzXS
-A9VoVwp/lcud4NlJ2OXIvCALgCcYrEQ/hxEROeqNHGsijgQ+1TEbh5fqbSOn3aZf
-dYp03ADkJvvS1a9U7f+dCpiUNXemj6nfCT5BsKtUx59GUdZrrfSMbtsbeuwHyWRp
-LAUJyfckeck85DBzzqzdjO+vpZCvcOloORCwMKHyM4JwqlW66Atkl3NnnVSFy/XD
-axzUVmuyFC9FkE3y/ySzyuvz7szMuh2Eb7bOZIieidmIEHyIWSzUV0yAp0x/kL+m
-dDd9eU7zoDJg2OP52kp5+kTrrpviBoSMZEfZ1qHuFWlW0S53d3U9r6Q0UR8Mcp9X
-wpBnI/lOAxRdO7Gth1pRlzZOIiZYJfBx0IDp
-=kX7M
------END PGP PUBLIC KEY BLOCK-----

diff --git a/fedora-modular.repo b/fedora-modular.repo
deleted file mode 100644
index f511170..0000000
--- a/fedora-modular.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[fedora-modular]
-name=Fedora Modular $releasever - $basearch
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
-enabled=AUTO_VALUE
-countme=1
-metadata_expire=AUTO_VALUE
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-modular-debuginfo]
-name=Fedora Modular $releasever - $basearch - Debug
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch
-enabled=0
-metadata_expire=AUTO_VALUE
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-modular-source]
-name=Fedora Modular $releasever - Source
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=AUTO_VALUE
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False

diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo
deleted file mode 100644
index d4ecfa1..0000000
--- a/fedora-rawhide-modular.repo
+++ /dev/null
@@ -1,57 +0,0 @@
-# These packages are untested and still under development. This
-# repository is used for development of new releases.
-#
-# This repository can see significant daily turnover and major
-# functionality changes which cause unexpected problems with other
-# development packages. Please use these packages if you want to work
-# with the Fedora developers by testing these new development packages.
-#
-# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription
-# Required) is available as a discussion forum for
-# testing and troubleshooting for development packages in conjunction
-# with new test releases.
-#
-# More information is available at http://fedoraproject.org/wiki/Testing
-#
-# Reproducible and reportable issues should be filed at
-# http://bugzilla.redhat.com/.
-#
-# Product: Fedora
-# Version: rawhide-modular
-
-[rawhide-modular]
-name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release
-#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
-enabled=AUTO_VALUE
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
-skip_if_unavailable=False
-
-[rawhide-modular-debuginfo]
-name=Fedora - Modular Rawhide - Debug
-#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
-skip_if_unavailable=False
-
-[rawhide-modular-source]
-name=Fedora - Modular Rawhide - Source
-#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch
-enabled=0
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-rawhide-$basearch AUTO_VALUE
-skip_if_unavailable=False

diff --git a/fedora-repos.spec b/fedora-repos.spec
index d8e41e0..4ee194a 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -4,13 +4,14 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        39
-Release:        0.2%{?eln:.eln%{eln}}
+Release:        0.3%{?eln:.eln%{eln}}
 License:        MIT
 URL:            https://fedoraproject.org/
 
 Provides:       fedora-repos(%{version}) = %{release}
 Requires:       system-release(%{version})
 Obsoletes:      fedora-repos < 33-0.7
+Obsoletes:      fedora-repos-modular < 39-0.3
 %if %{rawhide_release} == %{version}
 Requires:       fedora-repos-rawhide = %{version}-%{release}
 %endif
@@ -83,12 +84,6 @@ Source60:       RPM-GPG-KEY-fedora-40-primary
 # ensures users have the next future key installed and referenced, even if they
 # don't update very often. This will smooth out Rawhide N->N+1 transition for them).
 
-Source100:      fedora-modular.repo
-Source101:      fedora-updates-modular.repo
-Source102:      fedora-updates-testing-modular.repo
-Source103:      fedora-rawhide-modular.repo
-Source104:      RPM-GPG-KEY-fedora-modularity
-
 Source150:      RPM-GPG-KEY-fedora-iot-2019
 Source151:      fedora.conf
 Source152:      fedora-compose.conf
@@ -104,21 +99,11 @@ Source505:      fedora-39-ima.pem
 %description
 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}
-%if %{rawhide_release} == %{version}
-Requires:       fedora-repos-rawhide-modular = %{version}-%{release}
-%endif
-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-repos-rawhide < 33-0.7
+Obsoletes:      fedora-repos-rawhide-modular < 39-0.3
 
 %description rawhide
 This package provides the rawhide repo definitions.
@@ -132,15 +117,6 @@ This package provides the repo definition for the updates archive repo.
 It is a package repository that contains any RPM that has made it to
 stable in Bodhi and been available in the Fedora updates repo in the past.
 
-%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
 
@@ -233,10 +209,10 @@ eln_enabled=0
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1
 done
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-updates}.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${stable_enabled}/" $repo || exit 1
 done
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing.repo; do
     sed -i "s/^enabled=AUTO_VALUE$/enabled=${testing_enabled}/" $repo || exit 1
 done
 for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-archive.repo; do
@@ -262,7 +238,7 @@ expire_value='6h'
 %else
 expire_value='7d'
 %endif
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora.repo; do
     sed -i "/^metadata_expire=/ s/AUTO_VALUE/${expire_value}/" \
         $repo || exit 1
 done
@@ -288,20 +264,19 @@ disabled_repos=()
 
 %if 0%{?eln}
 enabled_repos+=(fedora-eln)
-disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
-  fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular)
+disabled_repos+=(fedora fedora-updates fedora-updates-archive \
+  fedora-updates-testing)
 %elif %{rawhide_release} == %{version}
-enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-cisco-openh264)
-disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
-  fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular)
+enabled_repos+=(fedora-rawhide fedora-cisco-openh264)
+disabled_repos+=(fedora fedora-updates fedora-updates-archive \
+  fedora-updates-testing)
 %else
-enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \
-  fedora-updates-modular)
-disabled_repos+=(fedora-rawhide fedora-rawhide-modular)
+enabled_repos+=(fedora fedora-updates fedora-updates-archive)
+disabled_repos+=(fedora-rawhide)
 %if %{updates_testing_enabled}
-enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
+enabled_repos+=(fedora-updates-testing)
 %else
-disabled_repos+=(fedora-updates-testing fedora-updates-testing-modular)
+disabled_repos+=(fedora-updates-testing)
 %endif
 %endif
 
@@ -320,7 +295,7 @@ done
 
 # Make sure updates-testing is not enabled in a Final (stable) release
 %if "%{release}" >= "1"
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing.repo; do
     if grep -q 'enabled=1' $repo; then
         echo "ERROR: Repo $repo should be disabled in a stable release, but it isn't"
         exit 1
@@ -334,7 +309,7 @@ expire_value='6h'
 %else
 expire_value='7d'
 %endif
-for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do
+for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora.repo; do
     lines=$(grep '^metadata_expire=' $repo | sort | uniq)
     if [ "$(echo "$lines" | wc -l)" -ne 1 ]; then
         echo "ERROR: Non-matching metadata_expire lines in $repo: $lines"
@@ -394,20 +369,12 @@ rm -f "$TMPRING"
 %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 archive
 %config(noreplace) /etc/yum.repos.d/fedora-updates-archive.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
-
 
 %files -n fedora-gpg-keys
 %dir /etc/pki/rpm-gpg
@@ -425,6 +392,10 @@ rm -f "$TMPRING"
 
 
 %changelog
+* Mon Jul 10 2023 Miro Hrončok <mhroncok@redhat.com> - 39-0.3
+- Drop fedora-repos-modular and fedora-repos-rawhide-modular packages
+- https://fedoraproject.org/wiki/Changes/RetireModularity
+
 * Sat Feb 18 2023 Kevin Fenzi <kevin@scrye.com> - 39-0.2
 - Include IMA public certs.
 

diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo
deleted file mode 100644
index f5350a0..0000000
--- a/fedora-updates-modular.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[updates-modular]
-name=Fedora Modular $releasever - $basearch - Updates
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
-enabled=AUTO_VALUE
-countme=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-modular-debuginfo]
-name=Fedora Modular $releasever - $basearch - Updates - Debug
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-modular-source]
-name=Fedora Modular $releasever - Updates Source
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False

diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo
deleted file mode 100644
index 3b9bfca..0000000
--- a/fedora-updates-testing-modular.repo
+++ /dev/null
@@ -1,36 +0,0 @@
-[updates-testing-modular]
-name=Fedora Modular $releasever - $basearch - Test Updates
-#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch
-enabled=AUTO_VALUE
-countme=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-testing-modular-debuginfo]
-name=Fedora Modular $releasever - $basearch - Test Updates Debug
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[updates-testing-modular-source]
-name=Fedora Modular $releasever - Test Updates Source
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch
-enabled=0
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False