diff --git a/README-epel-8-packaging.md b/README-epel-8-packaging.md index 91b2712..967409c 100644 --- a/README-epel-8-packaging.md +++ b/README-epel-8-packaging.md @@ -28,27 +28,14 @@ branching to EPEL, other ones can step in and do so. ## EPEL Next -EPEL packages are built against RHEL. EPEL Next is an additional repository -that allows package maintainers to alternatively build against CentOS Stream. -This is sometimes necessary when CentOS Stream contains an upcoming RHEL -library rebase, or if an EPEL package has a minimum version build requirement -that is already in CentOS Stream but not yet in RHEL. EPEL Next has its own -distgit branches, koji build targets, and bodhi releases. - -EPEL Next packages have `.next` appended to the disttag (e.g. a disttag of -`.el8.next` for epel8-next) to provide an upgrade path from an EPEL package -that was built from the same distgit commit. A package maintainer can rebuild -the same commit for both EPEL and EPEL Next and get two different NVRs in koji. -Within six months, the build requirement necessitating building in EPEL Next -should be in RHEL, and at that time the package maintainer can do a normal -release bump commit in the EPEL branch and get a newer NVR than both the -previous EPEL and EPEL Next packages. - -To get started with EPEL Next, request the corresponding branch for the EPEL -release you are targeting, e.g. request an epel8-next branch to rebuild an -epel8 package against CentOS Stream 8. Once the branch is created you can -merge commits from other branches and submit a build just like you would for -other EPEL or Fedora branches. +EPEL 8 Next was shut down in June 2024, corresponding to the EOL of CentOS +Stream 8. + +EPEL 8 Next was a place for maintainers to optionally build against CentOS +Stream 8 instead of RHEL 8. This was sometimes necessary when CentOS Stream 8 +contains an upcoming RHEL 8 library rebase, or if an EPEL 8 package has a +minimum version build requirement that is already in CentOS Stream 8 but not +yet in RHEL 8. ## EPEL Playground diff --git a/epel-next-testing.repo b/epel-next-testing.repo deleted file mode 100644 index ce3dfbe..0000000 --- a/epel-next-testing.repo +++ /dev/null @@ -1,30 +0,0 @@ -[epel-next-testing] -name=Extra Packages for Enterprise Linux 8 - Next - Testing - $basearch -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/testing/next/8/Everything/$basearch/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-8&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgcheck=1 -countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 - -[epel-next-testing-debuginfo] -name=Extra Packages for Enterprise Linux 8 - Next - Testing - $basearch - Debug -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/testing/next/8/Everything/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-debug-8&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 - -[epel-next-testing-source] -name=Extra Packages for Enterprise Linux 8 - Next - Testing - $basearch - Source -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. -#baseurl=https://download.example/pub/epel/testing/next/8/Everything/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-source-8&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 diff --git a/epel-next.repo b/epel-next.repo deleted file mode 100644 index f665d29..0000000 --- a/epel-next.repo +++ /dev/null @@ -1,30 +0,0 @@ -[epel-next] -name=Extra Packages for Enterprise Linux 8 - Next - $basearch -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/next/8/Everything/$basearch/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-8&arch=$basearch&infra=$infra&content=$contentdir -enabled=1 -gpgcheck=1 -countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 - -[epel-next-debuginfo] -name=Extra Packages for Enterprise Linux 8 - Next - $basearch - Debug -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place its address here. -#baseurl=https://download.example/pub/epel/next/8/Everything/$basearch/debug/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-debug-8&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 - -[epel-next-source] -name=Extra Packages for Enterprise Linux 8 - Next - $basearch - Source -# It is much more secure to use the metalink, but if you wish to use a local mirror -# place it's address here. -#baseurl=https://download.example/pub/epel/next/8/Everything/source/tree/ -metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-source-8&arch=$basearch&infra=$infra&content=$contentdir -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 -gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 792aae3..aba4cfe 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,6 +1,6 @@ Name: epel-release Version: 8 -Release: 19%{dist} +Release: 20%{dist} Summary: Extra Packages for Enterprise Linux repository configuration License: GPLv2 @@ -18,8 +18,6 @@ Source3: 90-epel.preset Source100: epel.repo Source101: epel-testing.repo -Source102: epel-next.repo -Source103: epel-next-testing.repo Source105: epel-modular.repo Source106: epel-testing-modular.repo @@ -33,7 +31,10 @@ Conflicts: fedora-release # crb needs config-manager to run # But only recommend it, incase people do not need crb Recommends: dnf-command(config-manager) -Recommends: (epel-next-release if centos-stream-release) +# EPEL 8 Next is EOL, but EPEL 8 continues. Obsolete the epel-next-release +# package to remove the EPEL 8 Next repos for any EL8 systems that still have +# it installed. +Obsoletes: epel-next-release < 8-20 %description @@ -41,16 +42,6 @@ This package contains the Extra Packages for Enterprise Linux (EPEL) repository GPG key as well as configuration for yum. -%package -n epel-next-release -Summary: Extra Packages for Enterprise Linux Next repository configuration -Requires: %{name} = %{version}-%{release} - - -%description -n epel-next-release -This package contains the Extra Packages for Enterprise Linux (EPEL) Next -configuration for yum. - - %prep %setup -q -c -T install -pm 644 %{SOURCE1} . @@ -64,7 +55,7 @@ install -Dpm 644 %{SOURCE0} \ # yum install -dm 755 %{buildroot}%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE105} %{SOURCE106} \ +install -pm 644 %{SOURCE100} %{SOURCE101} %{SOURCE105} %{SOURCE106} \ %{buildroot}%{_sysconfdir}/yum.repos.d install -pm 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset @@ -92,12 +83,10 @@ fi %{_bindir}/crb -%files -n epel-next-release -%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next.repo -%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next-testing.repo - - %changelog +* Thu Jun 27 2024 Carl George - 8-20 +- Obsolete epel-next-release subpackage for EPEL 8 Next retirement + * Mon Apr 17 2023 Troy Dawson - 8-19 - Tweak crb script, check os-release for RHEL (#2186721)