PR#62: Split modular repos to the separate packages - rpms/fedora-repos

rpms / fedora-repos

#62 Split modular repos to the separate packages

Closed 3 years ago by mohanboddu. Opened 3 years ago by ignatenkobrain.

rpms/ ignatenkobrain/fedora-repos modular-split into master

Split modular repos to the separate packages

Igor Raits • 3 years ago

007b8f2

fedora-repos.spec

file modified

+28 -9

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

ignatenkobrain commented 3 years ago

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

fedora-repos on  master [⇡?] 
❯ sudo dnf --repofrompath=test,$PWD update
Added test repo from /home/brain/Projects/fedora/fedora-repos
test                                            3.9 MB/s | 4.0 kB     00:00    
Dependencies resolved.
================================================================================
 Package                            Architecture Version       Repository  Size
================================================================================
Upgrading:
 fedora-gpg-keys                    noarch       33-0.6        test       103 k
 fedora-repos                       noarch       33-0.6        test       9.8 k
 fedora-repos-rawhide               noarch       33-0.6        test       9.2 k
Installing dependencies:
 fedora-repos-modular               noarch       33-0.6        test       9.3 k
 fedora-repos-rawhide-modular       noarch       33-0.6        test       9.2 k

Transaction Summary
================================================================================
Install  2 Packages
Upgrade  3 Packages

Total size: 140 k
Is this ok [y/N]:

zbyszek commented 3 years ago

Looks great.

churchyard commented on line 31 of fedora-repos.spec 3 years ago

Why do fedora-repos-modular require fedora-repos-rawhide-modular?

churchyard commented 3 years ago

Why do fedora-repos-modular require fedora-repos-rawhide-modular?

To answer my own question, this is done on rawhide only for fedora-repos-rawhide as well. After branching, it gets dropped. https://src.fedoraproject.org/rpms/fedora-repos/c/bcb2ffa022ca35fa6ac0338fce7ee9d17cde6bc8?branch=f32

ngompa commented 3 years ago

:thumbsup:

sgallagh commented 3 years ago

:thumbsdown:

Please do not merge this until FESCo issue #2114 is resolved.

churchyard commented 3 years ago

#2114 was resolved and https://fedoraproject.org/wiki/Changes/ModularReposSubpackage approved.

@ignatenkobrain Could you please rebase, but not merge yet? I'll work on kickstarts / comps change and we can coordinate the merge.

Edited 3 years ago by churchyard

rebased onto 007b8f2

3 years ago

mohanboddu commented 3 years ago

Closing in favor of https://src.fedoraproject.org/rpms/fedora-repos/pull-request/65#

Pull-Request has been closed by mohanboddu

3 years ago

sgallagh commented 3 years ago

Closing in favor of https://src.fedoraproject.org/rpms/fedora-repos/pull-request/65#

Just an FYI, there's no difference between those two PRs; I incorporated this one into that one. I think I rebased it atop the current HEAD, which is the only reason this PR wasn't closed by merging that one.