PR#2: Merge changes from epel8 branch - rpms/epel-release

rpms / epel-release

#2 Merge changes from epel8 branch

Merged 4 years ago by mohanboddu. Opened 4 years ago by pgreco.

rpms/ pgreco/epel-release epel8-playground into epel8-playground

Fix koji target

Pablo Greco • 4 years ago

9444003

Merge changes from epel8 branch

Pablo Greco • 4 years ago

5b72b8d

epel-playground.repo

file modified

+9 -9

		`@@ -1,26 +1,26 @@`
		`[epel-playground]`
		`- name=Extra Packages for Enterprise Linux $release - Playground - $basearch`
		`- #baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/$basearch`
		`+ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch`
		`+ #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch`
		`metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$release&arch=$basearch&infra=$infra&content=$contentdir`
		`failovermethod=priority`
		`enabled=0`
		`gpgcheck=1`
		`- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release`
		`+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever`

		`[epel-playground-debuginfo]`
		`- name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Debug`
		`- #baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/$basearch/debug`
		`+ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug`
		`+ #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/$basearch/debug`
		`metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir`
		`failovermethod=priority`
		`enabled=0`
		`- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release`
		`+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever`
		`gpgcheck=1`

		`[epel-playground-source]`
		`- name=Extra Packages for Enterprise Linux $release - Playground - $basearch - Source`
		`- #baseurl=http://download.fedoraproject.org/pub/epel/playground/$release/Everything/SRPMS`
		`+ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source`
		`+ #baseurl=https://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/source/tree/`
		`metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir`
		`failovermethod=priority`
		`enabled=0`
		`- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release`
		`+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever`
		`gpgcheck=1`

epel-release.spec

file modified

+7 -2

		`@@ -1,6 +1,6 @@`
		`Name: epel-release`
		`Version: 8`
		`- Release: 3%{dist}`
		`+ Release: 4%{dist}`
		`Summary: Extra Packages for Enterprise Linux repository configuration`

		`Group: System Environment/Base`
		`@@ -56,12 +56,17 @@`
		`%files`
		`%defattr(-,root,root,-)`
		`%doc GPL README-epel-8-packaging.md`
		`-`
		`%config(noreplace) /etc/yum.repos.d/*`
		`/etc/pki/rpm-gpg/*`
		`%{_prefix}/lib/systemd/system-preset/90-epel.preset`

		`%changelog`
		`+ * Thu Aug 1 2019 Pablo Greco <pgreco@centosproject.org> - 8-4`
		`+ - Use the correct var for dnf to expand`
		`+ - Update playground source url`
		`+ - Remove epel-modules repo`
		`+ - Use https in baseurl`
		`+`
		`* Thu Aug 1 2019 Stephen Smoogen <smooge@fedoraproject.org> - 8-3`
		`- Make sure that the key name is named correctly`

epel-testing.repo

file modified

+12 -12

		`@@ -1,26 +1,26 @@`
		`[epel-testing]`
		`- name=Extra Packages for Enterprise Linux $release - Testing - $basearch`
		`- #baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/$basearch`
		`- metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$release&arch=$basearch&infra=$infra&content=$contentdir`
		`+ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch`
		`+ #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch`
		`+ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir`
		`failovermethod=priority`
		`enabled=0`
		`gpgcheck=1`
		`- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release`
		`+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever`

		`[epel-testing-debuginfo]`
		`- name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Debug`
		`- #baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/$basearch/debug`
		`- metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$release&arch=$basearch&infra=$infra&content=$contentdir`
		`+ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug`
		`+ #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/$basearch/debug`
		`+ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir`
		`failovermethod=priority`
		`enabled=0`
		`- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release`
		`+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever`
		`gpgcheck=1`

		`[epel-testing-source]`
		`- name=Extra Packages for Enterprise Linux $release - Testing - $basearch - Source`
		`- #baseurl=http://download.fedoraproject.org/pub/epel/testing/$release/Everything/SRPMS`
		`- metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$release&arch=$basearch&infra=$infra&content=$contentdir`
		`+ name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source`
		`+ #baseurl=https://download.fedoraproject.org/pub/epel/testing/$releasever/Everything/SRPMS`
		`+ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir`
		`failovermethod=priority`
		`enabled=0`
		`- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release`
		`+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever`
		`gpgcheck=1`

epel.repo

file modified

+12 -21

		`@@ -1,35 +1,26 @@`
		`[epel]`
		`- name=Extra Packages for Enterprise Linux $release - $basearch`
		`- #baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch`
		`- metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir`
		`+ name=Extra Packages for Enterprise Linux $releasever - $basearch`
		`+ #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch`
		`+ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir`
		`failovermethod=priority`
		`enabled=1`
		`gpgcheck=1`
		`- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release`
		`-`
		`- [epel-modules]`
		`- name=Extra Packages for Enterprise Linux $release - $basearch`
		`- #baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch`
		`- metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$release&arch=$basearch&infra=$infra&content=$contentdir`
		`- failovermethod=priority`
		`- enabled=0`
		`- gpgcheck=1`
		`- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release`
		`+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever`

		`[epel-debuginfo]`
		`- name=Extra Packages for Enterprise Linux $release - $basearch - Debug`
		`- #baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/$basearch/debug`
		`- metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$release&arch=$basearch&infra=$infra&content=$contentdir`
		`+ name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug`
		`+ #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/$basearch/debug`
		`+ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir`
		`failovermethod=priority`
		`enabled=0`
		`- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release`
		`+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever`
		`gpgcheck=1`

		`[epel-source]`
		`- name=Extra Packages for Enterprise Linux $release - $basearch - Source`
		`- #baseurl=http://download.fedoraproject.org/pub/epel/$release/Everything/SRPMS`
		`- metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$release&arch=$basearch&infra=$infra&content=$contentdir`
		`+ name=Extra Packages for Enterprise Linux $releasever - $basearch - Source`
		`+ #baseurl=https://download.fedoraproject.org/pub/epel/$releasever/Everything/SRPMS`
		`+ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir`
		`failovermethod=priority`
		`enabled=0`
		`- gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$release`
		`+ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever`
		`gpgcheck=1`