Tweak crb script. Add FORCE_DNF option

Signed-off-by: Troy Dawson <tdawson@redhat.com>

90-epel.preset

@@ -1,5 +1,9 @@
-# See https://docs.fedoraproject.org/en-US/packaging-guidelines/DefaultServices/
-# for the Fedora policy.  EPEL follows the same policy.  The EPEL Steering
-# Committee can approve exceptions to the policy, which will be defined in this
-# file.
-
+# Also see:
+# https://fedoraproject.org/wiki/Starting_services_by_default
+#
+# https://bugzilla.redhat.com/show_bug.cgi?id=1901721
+enable x509watch.timer
+#
+# https://bugzilla.redhat.com/show_bug.cgi?id=1986205
+#
+enable certbot-renew.timer

GPL

@@ -1,8 +1,16 @@
+*****************************************************************************
+The following copyright applies to the Red Hat Linux compilation and any 
+portions of Red Hat Linux it does not conflict with. Whenever this
+policy does conflict with the copyright of any individual portion of Red Hat 
+Linux, it does not apply.
+
+*****************************************************************************
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- <https://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -304,7 +312,8 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along
-    with this program; if not, see <https://www.gnu.org/licenses/>.
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -328,8 +337,8 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  <signature of Moe Ghoul>, 1 April 1989
-  Moe Ghoul, President of Vice
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may

README-epel-8-packaging.md

@@ -0,0 +1,151 @@
+# EPEL-8 Packaging Procedures
+
+## Introduction
+
+When a new Red Hat Enterprise Linux occurs, one of the steps to get
+EPEL going for it is branching of various packages into new
+namespace. The EPEL Steering Committee does not mass branch all
+existing packages into the namespace because it has caused multiple
+problems:
+
+1. The package maintainers did not want to support the package in the
+newer version of EPEL. Package maintainers may only want to support
+certain versions of Enterprise Linux or may want to wait until their
+favourite derivative appears.
+
+2. The package does not work in the latest version of RHEL. With
+multiple years between releases, software which worked on Fedora 18
+which would branch to EPEL-7 may not exist anymore with Fedora 28 and
+EPEL-8 would need a completely different version.
+
+## Consumer request for packages
+
+People who are interested in getting packages into EPEL should contact
+the package maintainer through
+[bugzilla](https://bugzilla.redhat.com/). This allows for the requests
+to be tracked and if the primary maintainer is not interested in
+branching to EPEL, other ones can step in and do so.
+
+## EPEL Next
+
+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
+
+EPEL Playground was shut down in January 2022
+
+EPEL 8 Playground was a place that developers and maintainers could 
+"play around" with updated, or changed packages in epel. EPEL Playground
+never really worked out and ended up being more burden than helpful.
+
+If developers or maintainers want something similar to EPEL Playground 
+we recommend Fedora COPR, which has availability for EPEL builds.
+
+
+## Developer request for branching multiple packages
+
+Branching is handled the same way as requesting a branch using `fedpkg
+request-branch`. A maintainer can request an epel8 branch using
+`fedpkg request-branch epel8` which will create a ticket in
+https://pagure.io/releng/fedora-scm-requests/issues and Release
+Engineering will process these requests.
+
+To branch multiple packages please use this or a variant of this
+script:
+
+```
+#!/usr/bin/sh
+# Reminder to get an updated pagure token for releng tickets
+# Usage: epel-8.sh foo bar goo blah blech
+if [ $# -lt 1 ]
+then
+    echo "At least one package name should be provided"
+else
+    TMPDIR=`mktemp -d /tmp/epel8.XXXXXX`
+    pushd "$TMPDIR"
+    for pkg in "$@"
+    do
+        fedpkg clone "$pkg"
+        pushd "$pkg"
+        fedpkg request-branch epel8
+	    fedpkg request-branch epel8-playground
+        popd
+    done
+    rm -rfv "$TMPDIR"
+fi
+```
+
+Releng will then work through the tickets in the system which is
+adding branches to the PDC and src.fedoraproject.org.
+
+
+## Known Issues
+
+1. /usr/bin/python does not exist. Choose ``/usr/bin/python3`` or
+``/usr/bin/python2`` and patch appropriately.
+
+2. ``python2-sphinx`` is not shipped. Most packages should work with
+python3-sphinx, and if it doesn't please open a bug. The python team
+has been good about making fixes for this.
+
+3. When branching python packages, be aware that python in EL-8 is
+python36 and not the version currently in rawhide. This has come up
+with a couple of test packages where they assumed python37 or later.
+
+4. ``systemd-rpm-macros`` is not a separate packages. If needed, used
+``BuildRequires: systemd``
+
+5. While EL-8 comes with platform-python, it should NOT be used in
+``Requires:`` unless absolutely neccessary. python3 should be used
+instead. (Exceptions can be made but will be rare and need
+justification.)
+
+**Accepted Exceptions:**
+* Use python3.6dist(coverage) instead of python3-coverage. This
+  package is not shipped but is needed in %check code.
+
+6. Sometimes RHEL8 only has a python3 package for a dependency you
+need for your build. (Example: python-bleach requires
+python2-html5lib, but RHEL8 provides only python3-html5lib). For
+EPEL-8.0 we only suggest one choice:
+
+* Choose not to have the python2 part of your package and patch
+  whatever to use python3.
+
+7. Python2 packages are discouraged. RHEL-8 will contain python2.7
+until probably the end of life of RHEL-7. However support upstream
+will only be minimal. When modularity occurs, we suggest that you make
+whatever python2 packages modules which can be pulled out when
+RHEL-8.N no longer has python2.
+
+8. While a RHEL src.rpm might produce a -devel package, it may not
+currently be in the build repository. When running into this please
+open a ticket with https://pagure.io/epel/new_issue for us to put in a
+request for it to be added to Red Hat's Code Ready Builder. After
+modularity is enabled, changes to what is done will be needed.
+
+9. EPEL-8.0 may not work with the RHEL-8.1 beta. There seem to be
+changes in dnf and zchunk which we have not worked out. This line will
+be updated.
+
+
+## Definitions
+
+1. Package maintainer. Person who has accepted responsibility to
+package and maintain software in the Fedora Project ecosystem. The
+main packager is usually someone focused on Fedora Linux, and
+secondary packagers may be focused on particular use cases like EPEL.
+
+2. Consumer. A person who has subscribed to EPEL for packages but is
+not a maintainer.
+
+3. PDC. Product Definition Center. A tool to help list the lifetime
+and permissions that a product has so that branching and updates can
+be better managed.

RPM-GPG-KEY-EPEL-10

@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBGV4X6kBEAC3eQxgiWuo08uc3mHo4ELux++uqTnYz/tJzEf9Ou3h36WnhumA
-Nvs+Ts5h8PBx879Y9/aIX1Z20p1kf6tBCinZnEJu59n+TAAsph0+XQlV1l5YkleK
-Z2ff/Fg65k8QcLXWaIGykA/FaKznRiSurGuD6tRGhJw7DawEwBJr8QZSkRUpnH1L
-URW97Q/iKrRPiE5VEayE0y8eAL28jIIiFvR+4oJMzvCsRRB/2wYZ2MlJOW91hcYf
-mbUoXKOBD5UzsJylu7kj25K/ge8rEJ7KicOOwcdYddxsU3DxGSSfwF8AMagENcm2
-XROeXknjm84A8sNlUkFZBJwfuc7eRTiZGJrnQQVYLrkKj8Mxpq9Ts7hU51TqAWNI
-uvGDlJdYNE3D2RMqjMEsZ8ej08Thrib6xslu4NzTBkt+6QNnXL4E3hEgYtoyio60
-GswSz2ulogKg7X4JrNdJYE8/qNowyF3hoVgj5TG1/wQRq+5HlMMOLjgGu9wzLUix
-fnVfEUnzaofbrUf4/GabCaeY8xRe4tFQrvzigQ4g+kgwKKnfAeqBmPov0yljkw9z
-BYJWR5zvaw0ffg9Ing00KUSaXBXA5jSlgk1603Y+LefY1SlXsTyqohiRvGH6FI77
-HNMo72DwoJfFcYjncZUzKgXWJECR4nhVsdj6pKoOjcQ4aSuyVxtsR86ASQARAQAB
-tChGZWRvcmEgKGVwZWwxMCkgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQJOBBMB
-CAA4FiEEfY0Vy/xOYmiFkfsmM9mFF+N+0VgFAmV4X6kCGw8FCwkIBwIGFQoJCAsC
-BBYCAwECHgECF4AACgkQM9mFF+N+0Vhv/A/+PlhPLSctGRCUEahE+cN4764Acc3p
-l40ZYzXRhqR0/Tc1/cSDjlA3qVTc8SPohi5OJXwCyr9EiMqKoyoDN097euqbYpyp
-yN/Pj0lBjsXwcpdDtZ21WGeQU0Khb04N68bMtJbDaxeBciTvDDQravZuPPh0m4Rg
-Z6myEoa6Aa6EK0hI1Qwi1qIWeRiuEkVT671IaKVETBW5XiUpNBXDAB/L+6DzUF9u
-scBzfsUDiPO6NrpYDtV3jwq22y6gWluIct/Ka8brwPbqK2sBfFzrHboRhfqlTGjs
-7F9qUGwIQZn/A8iozXZYQ0+JG1bhQyvjA8eN1GOcRpT+O7H7JXN49o6IG2As4+iK
-F04+qjqAu2sVfpD8mzM2VubFNllcKKiyCzRYHhSbObRCPzsudDL9GPiXeGGaCuWg
-sDkiA1MESvf2tLETAGBs/TziO4GwmXUtlKbRiq1FYm90mVq9mBxPZ/Idn+yZusNB
-0O5SXIbI8lYZw5n4XTK4b+byHRBYsOTHiTsGvjTF2Y7oSwW2CVUmL6RZ23mI4qoY
-1p5kzRS+GjT1acnTei/FTsOlIKCsjfeHx7uxCkX6xpAD8P3UtLQqfsgH0CL4vSZt
-TGO6L1InQlp4ZG3OYIomTKbD3/R0wod3U3dTqdulQMXL895u6OLTY3spY2m2MO2k
-p9Dfd2pKuxK9Mys=
-=mhQZ
------END PGP PUBLIC KEY BLOCK-----

RPM-GPG-KEY-EPEL-8

@@ -0,0 +1,28 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFz3zvsBEADJOIIWllGudxnpvJnkxQz2CtoWI7godVnoclrdl83kVjqSQp+2
+dgxuG5mUiADUfYHaRQzxKw8efuQnwxzU9kZ70ngCxtmbQWGmUmfSThiapOz00018
++eo5MFabd2vdiGo1y+51m2sRDpN8qdCaqXko65cyMuLXrojJHIuvRA/x7iqOrRfy
+a8x3OxC4PEgl5pgDnP8pVK0lLYncDEQCN76D9ubhZQWhISF/zJI+e806V71hzfyL
+/Mt3mQm/li+lRKU25Usk9dWaf4NH/wZHMIPAkVJ4uD4H/uS49wqWnyiTYGT7hUbi
+ecF7crhLCmlRzvJR8mkRP6/4T/F3tNDPWZeDNEDVFUkTFHNU6/h2+O398MNY/fOh
+yKaNK3nnE0g6QJ1dOH31lXHARlpFOtWt3VmZU0JnWLeYdvap4Eff9qTWZJhI7Cq0
+Wm8DgLUpXgNlkmquvE7P2W5EAr2E5AqKQoDbfw/GiWdRvHWKeNGMRLnGI3QuoX3U
+pAlXD7v13VdZxNydvpeypbf/AfRyrHRKhkUj3cU1pYkM3DNZE77C5JUe6/0nxbt4
+ETUZBTgLgYJGP8c7PbkVnO6I/KgL1jw+7MW6Az8Ox+RXZLyGMVmbW/TMc8haJfKL
+MoUo3TVk8nPiUhoOC0/kI7j9ilFrBxBU5dUtF4ITAWc8xnG6jJs/IsvRpQARAQAB
+tChGZWRvcmEgRVBFTCAoOCkgPGVwZWxAZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMB
+AgAiBQJc9877AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAh6kWrL4bW
+oWagD/4xnLWws34GByVDQkjprk0fX7Iyhpm/U7BsIHKspHLL+Y46vAAGY/9vMvdE
+0fcr9Ek2Zp7zE1RWmSCzzzUgTG6BFoTG1H4Fho/7Z8BXK/jybowXSZfqXnTOfhSF
+alwDdwlSJvfYNV9MbyvbxN8qZRU1z7PEWZrIzFDDToFRk0R71zHpnPTNIJ5/YXTw
+NqU9OxII8hMQj4ufF11040AJQZ7br3rzerlyBOB+Jd1zSPVrAPpeMyJppWFHSDAI
+WK6x+am13VIInXtqB/Cz4GBHLFK5d2/IYspVw47Solj8jiFEtnAq6+1Aq5WH3iB4
+bE2e6z00DSF93frwOyWN7WmPIoc2QsNRJhgfJC+isGQAwwq8xAbHEBeuyMG8GZjz
+xohg0H4bOSEujVLTjH1xbAG4DnhWO/1VXLX+LXELycO8ZQTcjj/4AQKuo4wvMPrv
+9A169oETG+VwQlNd74VBPGCvhnzwGXNbTK/KH1+WRH0YSb+41flB3NKhMSU6dGI0
+SGtIxDSHhVVNmx2/6XiT9U/znrZsG5Kw8nIbbFz+9MGUUWgJMsd1Zl9R8gz7V9fp
+n7L7y5LhJ8HOCMsY/Z7/7HUs+t/A1MI4g7Q5g5UuSZdgi0zxukiWuCkLeAiAP4y7
+zKK4OjJ644NDcWCHa36znwVmkz3ixL8Q0auR15Oqq2BjR/fyog==
+=84m8
+-----END PGP PUBLIC KEY BLOCK-----

crb

@@ -1,14 +1,5 @@
 #!/bin/bash
-#
 #  Enable / Disable / Status the codeready-builder(CRB) or equivalent repo.
-#
-# Copyright (C) 2024
-# SPDX-License-Identifier:      GPL-2.0-only
-#
-# Authors:
-#     Troy Dawson <tdawson@redhat.com>
-#
-
 
 ###############
 # Show help

epel-modular.repo

@@ -0,0 +1,33 @@
+[epel-modular]
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - $basearch - RETIRED
+# 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/8/Modular/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-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-modular-debuginfo]
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - $basearch - Debug - RETIRED
+# 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/8/Modular/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
+
+[epel-modular-source]
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - $basearch - Source - RETIRED
+# 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/8/Modular/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1

epel-release.spec

@@ -1,73 +1,66 @@
 Name:           epel-release
-Version:        10
-Release:        %autorelease
+Version:        8
+Release:        22%{dist}
 Summary:        Extra Packages for Enterprise Linux repository configuration
-# Most things in this package are not considered copyrightable.  If that were
-# true for everything in the package, the license identifier would be
-# LicenseRef-Not-Copyrightable.  However, the exception is the crb script,
-# which is GPL-2.0-only.  Per advice from Fedora Legal, we should use
-# GPL-2.0-only as the license identifier for the package in this scenario.
-# https://bugzilla.redhat.com/show_bug.cgi?id=2302438
-License:        GPL-2.0-only
-BuildArch:      noarch
-URL:            https://epel.io
 
-# keys
-Source10:       https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-%{version}
+License:        GPLv2
 
-# repo configs
-Source20:       epel.repo
-Source21:       epel-testing.repo
+# This is a EPEL maintained package which is specific to
+# our distribution.  Thus the source is only available from
+# within this srpm.
+URL:            http://download.fedoraproject.org/pub/epel
+Source0:        http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8
+Source1:        GPL
+Source2:        README-epel-8-packaging.md
+# EPEL default preset policy (borrowed from fedora's 90-default.preset)
+Source3:        90-epel.preset
 
-# preset policy
-Source30:       90-epel.preset
 
-# Add epel crb script
-Source31:      crb
-# epel crb script is licensed GPL-2.0-only
-Source32:      GPL-2.0-only.txt
+Source100:      epel.repo
+Source101:      epel-testing.repo
+Source105:      epel-modular.repo
+Source106:      epel-testing-modular.repo
 
-# The setup process for EPEL involves installing epel-release before the EPEL
-# repository is available.  For this to continue to work correctly, all
-# dependencies of this package must be available from the default repositories.
-# Notably, if weak dependencies of this package are not present at the time of
-# installation, they will be skipped and never get installed.
-# https://pagure.io/epel/issue/328
-
-# This should only be installed on Enterprise Linux with the same major version
-Requires:       (redhat-release >= %{version} with redhat-release < %[%{version} + 1])
+# Add epel crb repo
+Source301:      crb
 
+BuildArch:     noarch
+Requires:      redhat-release >=  %{version}
+# epel-release is only for enterprise linux, not fedora
+Conflicts:     fedora-release
 # crb needs config-manager to run
 # But only recommend it, incase people do not need crb
-Recommends:     dnf-command(config-manager)
-
-# SELinux policy modules related to EPEL
-Recommends:     (selinux-policy-extra if selinux-policy)
+Recommends:    dnf-command(config-manager)
+# 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
 This package contains the Extra Packages for Enterprise Linux (EPEL) repository
-configuration and GPG key.
+GPG key as well as configuration for yum.
+
 
 %prep
-%setup -q -c -T
-# Add epel crb script license
-install -pm 644 %{SOURCE32} .
+%setup -q  -c -T
+install -pm 644 %{SOURCE1} .
+install -pm 644 %{SOURCE2} .
 
 
 %install
-# keys
-install -Dp -m 0644 -t %{buildroot}%{_sysconfdir}/pki/rpm-gpg %{S:10}
+#GPG Key
+install -Dpm 644 %{SOURCE0} \
+    %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version}
 
-# repo configs
-install -Dp -m 0644 -t %{buildroot}%{_sysconfdir}/yum.repos.d %{S:20} %{S:21}
-
-# preset policy
-install -Dp -m 0644 -t %{buildroot}%{_prefix}/lib/systemd/system-preset %{S:30}
-
-# Add epel crb script
-install -D -pm744 -t %{buildroot}%{_bindir} %{SOURCE31}
+# yum
+install -dm 755 %{buildroot}%{_sysconfdir}/yum.repos.d
+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
 
+# Add epel crb repo
+install -D -pm744 -t %{buildroot}%{_bindir} %{SOURCE301}
 
 %post
 # Doing a check to see if crb is enabled is as hard and resource intense as enabling or disabling crb.
@@ -79,13 +72,133 @@ fi
 
 
 %files
-%license GPL-2.0-only.txt
-%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version}
+%doc README-epel-8-packaging.md
+%license GPL
 %config(noreplace) %{_sysconfdir}/yum.repos.d/epel.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-modular.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing-modular.repo
+%{_sysconfdir}/pki/rpm-gpg/*
 %{_prefix}/lib/systemd/system-preset/90-epel.preset
 %{_bindir}/crb
 
 
 %changelog
-%autochangelog
+* Tue Apr 22 2025 Troy Dawson <tdawson@redhat.com> - 8-22
+- Tweak crb script. Add FORCE_DNF option
+
+* Fri Aug 30 2024 Troy Dawson <tdawson@redhat.com> - 8-21
+- Tweak crb script. Fix for RHEL rhui repos (#2308671)
+
+* Thu Jun 27 2024 Carl George <carlwgeorge@fedoraproject.org> - 8-20
+- Obsolete epel-next-release subpackage for EPEL 8 Next retirement
+
+* Mon Apr 17 2023 Troy Dawson <tdawson@redhat.com> - 8-19
+- Tweak crb script, check os-release for RHEL (#2186721)
+
+* Thu Sep 29 2022 Carl George <carl@george.computer> - 8-18
+- Disable epel-modular repo by default
+- Mark all epel-modular repos as deprecated
+
+* Tue Aug 09 2022 Troy Dawson <tdawson@redhat.com> - 8-17
+- Tweak crb script, Recommends dnf-command(config-manager) (#2115602)
+
+* Thu Jun 30 2022 Troy Dawson <tdawson@redhat.com> - 8-16
+- Add crb script
+
+* Mon Mar 14 2022 Troy Dawson <tdawson@redhat.com> - 8-15
+- Remove the use of $releasever ( rhbz#1969500 )
+
+* Fri Jan 28 2022 Troy Dawson <tdawson@redhat.com> - 8-14
+- Remove epel8-playground repo
+- Update playground section in README-epel-8-packaging.md
+
+* Fri Sep 03 2021 Mohan Boddu <mboddu@bhujji.com> - 8-13
+- Change the baseurl to point to source/tree for srpms
+
+* Fri Jul 30 2021 Kevin Fenzi <kevin@scrye.com> - 8-12
+- Enable certbot-renew.timer ( rhbz#1986205 )
+
+* Thu Jun 03 2021 Carl George <carl@george.computer> - 8-11
+- Add epel-next-release subpackage
+
+* Sat Dec 05 2020 Kevin Fenzi <kevin@scrye.com> - 8-10
+- Add x509watch.timer enabled by default. Fixes bug #1901721
+
+* Sat Oct 31 2020 Kevin Fenzi <kevin@scrye.com> - 8-9
+- Add countme feature for epel. Fixes bug #1825984
+
+* Fri Dec 13 2019 Merlin Mathesius <mmathesi@redhat.com> - 8-8%{dist}
+- Add modular repos.
+
+* Thu Oct 10 2019 Stephen Smoogen <smooge@fedoraproject.org> - 8-7%{dist}
+- Remove failovermethod from EPEL8 tree. It is no longer needed.
+
+* Mon Sep 16 2019 Stephen Smoogen <smooge@fedoraproject.org> - 8-6%{dist}
+- Change gpg key to use -8 versus -$releasever. This fixes bash problem
+
+* Tue Aug  6 2019 Stephen Smoogen <smooge@fedoraproject.org> - 8-5%{dist}
+- Fix playground release to have os/ on its name [Kevin Fenzi]
+- Make sure all values of $release are $releasever
+
+
+* 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
+
+* Thu Aug  1 2019 Stephen Smoogen <smooge@fedoraproject.org> - 8-2
+- Make baseurl paths match dl.fedoraproject.org
+- Add draft of epel8 packaging
+- Fix docs
+
+* Thu Jul 18 2019 Stephen Smoogen <smooge@smoogen-laptop.localdomain> - 8-1
+- Update for RHEL-8
+- Add playground repo data
+- Clean out 90-epel.preset to make sure we dont override RHEL-8 items. Just add items in which EPEL needs.
+
+* Mon Oct 02 2017 Kevin Fenzi <kevin@scrye.com> - 7-11
+- Add Conflicts on fedora-release to prevent people from installing on Fedora systems. Fixes bug #1497702
+
+* Sat Jun 24 2017 Kevin Fenzi <kevin@scrye.com> - 7-10
+- Change mirrorlist= in repo files to be metalink= (as thats what they are). Fixes bug #1451212
+
+* Tue Dec 27 2016 Kevin Fenzi <kevin@scrye.com> - 7-9
+- Add preset for drbdlinks package. Fixes bug #1405744
+
+* Sat Jul 23 2016 Kevin Fenzi <kevin@scrye.com> - 7-8
+- Drop duplicate libstoragemgmt from presets. Fixes bug #1358971
+
+* Fri Jun 03 2016 Kevin Fenzi <kevin@scrye.com> - 7-7
+- Drop initial-setup from presets. Fixes bug #1342511
+
+* Wed Mar 30 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 7-6
+- Remove macros.epel; let epel-rpm-macros handle it instead.
+
+* Tue Nov 25 2014 Rex Dieter <rdieter@fedoraproject.org> 7-5
+- fix typo in macros.epel
+
+* Fri Nov 21 2014 Rex Dieter <rdieter@fedoraproject.org> 7-4
+- add systemd 90-epel.preset
+
+* Fri Nov 21 2014 Rex Dieter <rdieter@fedoraproject.org> 7-3
+- implement %%epel macro
+
+* Tue Sep 02 2014 Kevin Fenzi <kevin@scrye.com> 7-2
+- Make repo files config(noreplace). Fixes bug #1135576
+
+* Thu Aug 28 2014 Dennis Gilmore <dennis@ausil.us> - 7-1
+- enable gpg checking now we are out of beta
+
+* Wed Jun 18 2014 Kevin Fenzi <kevin@scrye.com> 7-0.2
+- Drop unneeded up2date post/postun
+- Fixed up description.
+- Fixes bugs #1052434 and #1093918
+
+* Mon Dec 16 2013 Dennis Gilmore <dennis@ausil.us> - 7-0.1
+- initial epel 7 build. gpg cheking is disabled
+

epel-testing-modular.repo

@@ -0,0 +1,33 @@
+[epel-testing-modular]
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - RETIRED
+# 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/8/Modular/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+
+[epel-testing-modular-debuginfo]
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - Debug - RETIRED
+# 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/8/Modular/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
+
+[epel-testing-modular-source]
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - Source - RETIRED
+# 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/8/Modular/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1

epel-testing.repo

@@ -1,36 +1,30 @@
 [epel-testing]
-name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch
+name=Extra Packages for Enterprise Linux 8 - 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/$releasever${releasever_minor:+z}/Everything/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-testing-$releasever&arch=$basearch
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=24h
-countme=1
+#baseurl=https://download.example/pub/epel/testing/8/Everything/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 [epel-testing-debuginfo]
-name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug
+name=Extra Packages for Enterprise Linux 8 - 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/$releasever${releasever_minor:+z}/Everything/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-testing-debug-$releasever&arch=$basearch
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=24h
+#baseurl=https://download.example/pub/epel/testing/8/Everything/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
 
 [epel-testing-source]
-name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source
+name=Extra Packages for Enterprise Linux 8 - Testing - $basearch - Source
 # 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/$releasever${releasever_minor:+z}/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-testing-source-$releasever&arch=source
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=24h
+# place it's address here.
+#baseurl=https://download.example/pub/epel/testing/8/Everything/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1

epel.repo

@@ -1,36 +1,30 @@
 [epel]
-name=Extra Packages for Enterprise Linux $releasever - $basearch
+name=Extra Packages for Enterprise Linux 8 - $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/$releasever${releasever_minor:+z}/Everything/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-$releasever&arch=$basearch
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=24h
-countme=1
+#baseurl=https://download.example/pub/epel/8/Everything/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-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-debuginfo]
-name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
+name=Extra Packages for Enterprise Linux 8 - $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/$releasever${releasever_minor:+z}/Everything/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-debug-$releasever&arch=$basearch
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=24h
+#baseurl=https://download.example/pub/epel/8/Everything/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1
 
 [epel-source]
-name=Extra Packages for Enterprise Linux $releasever - $basearch - Source
+name=Extra Packages for Enterprise Linux 8 - $basearch - Source
 # 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/$releasever${releasever_minor:+z}/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel${releasever_minor:+-z}-source-$releasever&arch=source
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever_major
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=24h
+# place it's address here.
+#baseurl=https://download.example/pub/epel/8/Everything/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+gpgcheck=1