diff --git a/epel-playground.repo b/epel-playground.repo index ec567b2..b8ac302 100644 --- a/epel-playground.repo +++ b/epel-playground.repo @@ -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=http://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=http://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=http://download.fedoraproject.org/pub/epel/playground/$releasever/Everything/SRPMS 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 diff --git a/epel-release.spec b/epel-release.spec index 8d98b58..6d6de8e 100644 --- a/epel-release.spec +++ b/epel-release.spec @@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/systemd/system-preset/90-epel.preset %changelog +* Thu Aug 1 2019 Pablo Greco +- Use the correct var for dnf to expand + * Thu Aug 1 2019 Stephen Smoogen - 8-3 - Make sure that the key name is named correctly diff --git a/epel-testing.repo b/epel-testing.repo index 8f4ad36..1c6fb48 100644 --- a/epel-testing.repo +++ b/epel-testing.repo @@ -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=http://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=http://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=http://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 diff --git a/epel.repo b/epel.repo index bdc00e7..05bf03b 100644 --- a/epel.repo +++ b/epel.repo @@ -1,35 +1,35 @@ [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=http://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 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever [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 +name=Extra Packages for Enterprise Linux $releasever - $basearch +#baseurl=http://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=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=http://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=http://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