From 6b70e4bc5751f11d01399cfeaa87b8f0058f4bac Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 7 Oct 2021 23:51:30 -0500 Subject: [PATCH] Initial package for epel9-next --- .cvsignore | 0 README-epel-8-packaging.md | 199 ------------------------------------- RPM-GPG-KEY-EPEL-8 | 28 ------ RPM-GPG-KEY-EPEL-9 | 29 ++++++ epel-modular.repo | 12 +-- epel-next-testing.repo | 8 +- epel-next.repo | 8 +- epel-playground.repo | 10 +- epel-release.spec | 83 +++++++++++----- epel-testing-modular.repo | 8 +- epel-testing.repo | 12 +-- epel.repo | 12 +-- sources | 0 13 files changed, 120 insertions(+), 289 deletions(-) delete mode 100644 .cvsignore delete mode 100644 README-epel-8-packaging.md delete mode 100644 RPM-GPG-KEY-EPEL-8 create mode 100644 RPM-GPG-KEY-EPEL-9 delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/README-epel-8-packaging.md b/README-epel-8-packaging.md deleted file mode 100644 index c835254..0000000 --- a/README-epel-8-packaging.md +++ /dev/null @@ -1,199 +0,0 @@ -# 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 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 Playground - -We have added an additional set of channels for EPEL-8 called -playground. It is meant to be sort of like Fedora Rawhide so that -packagers can work on versions of software which are too fast moving -or will have large API changes from what they are putting in the -regular channel. - -To try and make this transparent, we have made it so when a package is -built in epel8 it will normally also be built in -epel8-playground. This is done via a packages.cfg file which lists the -targets for fedpkg to build against. A successful package build will -then go through 2 different paths: - -* epel8 package will go into bodhi to be put into epel8-testing -* epel8-playground will bypass bodhi and go directly into - epel8-playground the next compose. - -If a packager needs to focus only on epel8 or epel8-playground they -can edit packages.cfg to change the ```target= epel8 -epel8-playground``` to ```target= epel8 ```. - -Packages in epel8-playground are primarily to be used in the following -manner: - -* To test out some new version of the package that might not be stable - yet. - -* To test out some new packaging of the package - -* To test a major version change of the package that they want to land - at the next epel8 minor release. - -* To build a package that will never be stable enough for epel8, but - still could be useful to some. - -* At minor RHEL releases (ie, 8.1, 8.2) people can pull in big changes - from playground to the main epel8 packages. Since people will be - upgrading and paying more attention than usual anyhow at those - points, it’s a great chance to do that change, but also you want to - make sure it’s panned out, so you can test before hand in - playground. - -Consumers should be aware that packages in EPEL8-playground are there -without any Service Level Expectations. You may want to only cherry -pick packages from there as needed. - -## 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. diff --git a/RPM-GPG-KEY-EPEL-8 b/RPM-GPG-KEY-EPEL-8 deleted file mode 100644 index 30b69a6..0000000 --- a/RPM-GPG-KEY-EPEL-8 +++ /dev/null @@ -1,28 +0,0 @@ ------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----- diff --git a/RPM-GPG-KEY-EPEL-9 b/RPM-GPG-KEY-EPEL-9 new file mode 100644 index 0000000..234c12f --- /dev/null +++ b/RPM-GPG-KEY-EPEL-9 @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGE3mOsBEACsU+XwJWDJVkItBaugXhXIIkb9oe+7aadELuVo0kBmc3HXt/Yp +CJW9hHEiGZ6z2jwgPqyJjZhCvcAWvgzKcvqE+9i0NItV1rzfxrBe2BtUtZmVcuE6 +2b+SPfxQ2Hr8llaawRjt8BCFX/ZzM4/1Qk+EzlfTcEcpkMf6wdO7kD6ulBk/tbsW +DHX2lNcxszTf+XP9HXHWJlA2xBfP+Dk4gl4DnO2Y1xR0OSywE/QtvEbN5cY94ieu +n7CBy29AleMhmbnx9pw3NyxcFIAsEZHJoU4ZW9ulAJ/ogttSyAWeacW7eJGW31/Z +39cS+I4KXJgeGRI20RmpqfH0tuT+X5Da59YpjYxkbhSK3HYBVnNPhoJFUc2j5iKy +XLgkapu1xRnEJhw05kr4LCbud0NTvfecqSqa+59kuVc+zWmfTnGTYc0PXZ6Oa3rK +44UOmE6eAT5zd/ToleDO0VesN+EO7CXfRsm7HWGpABF5wNK3vIEF2uRr2VJMvgqS +9eNwhJyOzoca4xFSwCkc6dACGGkV+CqhufdFBhmcAsUotSxe3zmrBjqA0B/nxIvH +DVgOAMnVCe+Lmv8T0mFgqZSJdIUdKjnOLu/GRFhjDKIak4jeMBMTYpVnU+HhMHLq +uDiZkNEvEEGhBQmZuI8J55F/a6UURnxUwT3piyi3Pmr2IFD7ahBxPzOBCQARAQAB +tCdGZWRvcmEgKGVwZWw5KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAk4EEwEI +ADgWIQT/itE0RZcQbs6BO5GKOHK/MihGfAUCYTeY6wIbDwULCQgHAgYVCgkICwIE +FgIDAQIeAQIXgAAKCRCKOHK/MihGfFX/EACBPWv20+ttYu1A5WvtHJPzwbj0U4yF +3zTQpBglQ2UfkRpYdipTlT3Ih6j5h2VmgRPtINCc/ZE28adrWpBoeFIS2YAKOCLC +nZYtHl2nCoLq1U7FSttUGsZ/t8uGCBgnugTfnIYcmlP1jKKA6RJAclK89evDQX5n +R9ZD+Cq3CBMlttvSTCht0qQVlwycedH8iWyYgP/mF0W35BIn7NuuZwWhgR00n/VG +4nbKPOzTWbsP45awcmivdrS74P6mL84WfkghipdmcoyVb1B8ZP4Y/Ke0RXOnLhNe +CfrXXvuW+Pvg2RTfwRDtehGQPAgXbmLmz2ZkV69RGIr54HJv84NDbqZovRTMr7gL +9k3ciCzXCiYQgM8yAyGHV0KEhFSQ1HV7gMnt9UmxbxBE2pGU7vu3CwjYga5DpwU7 +w5wu1TmM5KgZtZvuWOTDnqDLf0cKoIbW8FeeCOn24elcj32bnQDuF9DPey1mqcvT +/yEo/Ushyz6CVYxN8DGgcy2M9JOsnmjDx02h6qgWGWDuKgb9jZrvRedpAQCeemEd +fhEs6ihqVxRFl16HxC4EVijybhAL76SsM2nbtIqW1apBQJQpXWtQwwdvgTVpdEtE +r4ArVJYX5LrswnWEQMOelugUG6S3ZjMfcyOa/O0364iY73vyVgaYK+2XtT2usMux +VL469Kj5m13T6w== +=Mjs/ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/epel-modular.repo b/epel-modular.repo index 3ac79cc..d898507 100644 --- a/epel-modular.repo +++ b/epel-modular.repo @@ -2,29 +2,29 @@ name=Extra Packages for Enterprise Linux Modular $releasever - $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/Modular/$basearch +#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-modular-debuginfo] name=Extra Packages for Enterprise Linux Modular $releasever - $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/Modular/$basearch/debug +#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - $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. +# place its address here. #baseurl=https://download.example/pub/epel/$releasever/Modular/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-next-testing.repo b/epel-next-testing.repo index 4581dfc..53d7531 100644 --- a/epel-next-testing.repo +++ b/epel-next-testing.repo @@ -7,7 +7,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-$rele enabled=0 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-next-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Debug @@ -16,15 +16,15 @@ name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearc #baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-next-testing-source] name=Extra Packages for Enterprise Linux $releasever - 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. +# place its address here. #baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-next.repo b/epel-next.repo index 49601ab..bb1bc23 100644 --- a/epel-next.repo +++ b/epel-next.repo @@ -7,7 +7,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&a enabled=1 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-next-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Debug @@ -16,15 +16,15 @@ name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Debug #baseurl=https://download.example/pub/epel/next/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-next-source] name=Extra Packages for Enterprise Linux $releasever - 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. +# place its address here. #baseurl=https://download.example/pub/epel/next/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-playground.repo b/epel-playground.repo index 90fdc98..3736236 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -2,21 +2,21 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $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/playground/$releasever/Everything/$basearch/os +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-playground-debuginfo] name=Extra Packages for Enterprise Linux $releasever - Playground - $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/playground/$releasever/Everything/$basearch/debug/tree +#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/debug/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-playground-source] @@ -26,5 +26,5 @@ name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - #baseurl=https://download.example/pub/epel/playground/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-release.spec b/epel-release.spec index 4578940..12efb41 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -1,34 +1,40 @@ +%bcond_with base +%bcond_without next +%bcond_with modular +%bcond_with playground + Name: epel-release -Version: 8 -Release: 13%{dist} +Version: 9 +Release: 1%{dist} Summary: Extra Packages for Enterprise Linux repository configuration - License: GPLv2 # 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 +Source0: http://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-%{version} Source1: GPL -Source2: README-epel-8-packaging.md -# EPEL default preset policy (borrowed from fedora's 90-default.preset) -Source3: 90-epel.preset - Source100: epel.repo -Source101: epel-testing.repo -Source102: epel-next.repo -Source103: epel-next-testing.repo -Source104: epel-playground.repo -Source105: epel-modular.repo -Source106: epel-testing-modular.repo - -BuildArch: noarch -Requires: redhat-release >= %{version} +Source101: epel-next.repo +Source102: epel-modular.repo +Source103: epel-playground.repo + +Source200: epel-testing.repo +Source201: epel-next-testing.repo +Source202: epel-testing-modular.repo + +# EPEL default preset policy (borrowed from fedora's 90-default.preset) +Source300: 90-epel.preset + +BuildArch: noarch +Requires: redhat-release >= %{version} # epel-release is only for enterprise linux, not fedora -Conflicts: fedora-release -Recommends: (epel-next-release if centos-stream-release) +Conflicts: fedora-release +%if %{with next} +Recommends: (epel-next-release if centos-stream-release) +%endif %description @@ -36,6 +42,7 @@ This package contains the Extra Packages for Enterprise Linux (EPEL) repository GPG key as well as configuration for yum. +%if %{with next} %package -n epel-next-release Summary: Extra Packages for Enterprise Linux Next repository configuration Requires: %{name} = %{version}-%{release} @@ -44,44 +51,66 @@ Requires: %{name} = %{version}-%{release} %description -n epel-next-release This package contains the Extra Packages for Enterprise Linux (EPEL) Next configuration for yum. +%endif %prep -%setup -q -c -T +%setup -q -c -T install -pm 644 %{SOURCE1} . -install -pm 644 %{SOURCE2} . %install -#GPG Key +# GPG Key install -Dpm 644 %{SOURCE0} \ %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%{version} -# yum +# yum repo configs install -dm 755 %{buildroot}%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{SOURCE105} %{SOURCE106} \ - %{buildroot}%{_sysconfdir}/yum.repos.d -install -pm 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset +%if %{with base} +install -pm 644 %{SOURCE100} %{SOURCE200} %{buildroot}%{_sysconfdir}/yum.repos.d +%endif +%if %{with next} +install -pm 644 %{SOURCE101} %{SOURCE201} %{buildroot}%{_sysconfdir}/yum.repos.d +%endif +%if %{with modular} +install -pm 644 %{SOURCE102} %{SOURCE202} %{buildroot}%{_sysconfdir}/yum.repos.d +%endif +%if %{with playground} +install -pm 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/yum.repos.d +%endif + +# systemd presets +install -pm 644 -D %{SOURCE300} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset %files -%doc README-epel-8-packaging.md %license GPL +%if %{with base} %config(noreplace) %{_sysconfdir}/yum.repos.d/epel.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing.repo +%endif +%if %{with modular} %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-modular.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing-modular.repo +%endif +%if %{with playground} %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-playground.repo +%endif %{_sysconfdir}/pki/rpm-gpg/* %{_prefix}/lib/systemd/system-preset/90-epel.preset +%if %{with next} %files -n epel-next-release %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next-testing.repo +%endif %changelog +* Fri Oct 08 2021 Carl George - 9-1 +- Initial package for epel9-next + * Fri Sep 03 2021 Mohan Boddu - 8-13 - Change the baseurl to point to source/tree for srpms diff --git a/epel-testing-modular.repo b/epel-testing-modular.repo index 494b84a..f312bb2 100644 --- a/epel-testing-modular.repo +++ b/epel-testing-modular.repo @@ -7,7 +7,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$re enabled=0 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-testing-modular-debuginfo] name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug @@ -16,15 +16,15 @@ name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basear #baseurl=https://download.example/pub/epel/testing/$releasever/Modular/$basearch/debug metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-testing-modular-source] name=Extra Packages for Enterprise Linux Modular $releasever - 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. +# place its address here. #baseurl=https://download.example/pub/epel/testing/$releasever/Modular/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel-testing.repo b/epel-testing.repo index a21a806..0211f45 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -2,29 +2,29 @@ name=Extra Packages for Enterprise Linux $releasever - 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/Everything/$basearch +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-testing-debuginfo] name=Extra Packages for Enterprise Linux $releasever - 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/Everything/$basearch/debug +#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-testing-source] name=Extra Packages for Enterprise Linux $releasever - 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. +# place its address here. #baseurl=https://download.example/pub/epel/testing/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/epel.repo b/epel.repo index eb3208d..c162fe5 100644 --- a/epel.repo +++ b/epel.repo @@ -2,29 +2,29 @@ name=Extra Packages for Enterprise Linux $releasever - $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/Everything/$basearch +#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=1 gpgcheck=1 countme=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [epel-debuginfo] name=Extra Packages for Enterprise Linux $releasever - $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/Everything/$basearch/debug +#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 [epel-source] name=Extra Packages for Enterprise Linux $releasever - $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. +# place its address here. #baseurl=https://download.example/pub/epel/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever gpgcheck=1 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000