[rpmfusion-nonfree-release/el8] Modify spec to match EL7 and adapt for EL8

commit 1575081412e2939205166fc6bf5e9c13f5f8d2ee Author: Xavier Bachelot <xavier(a)bachelot.org&gt; Date: Wed Jan 9 16:35:29 2019 +0100 Modify spec to match EL7 and adapt for EL8 RPM-GPG-KEY-rpmfusion-nonfree-fedora-28-primary | 29 -- RPM-GPG-KEY-rpmfusion-nonfree-fedora-29-primary | 29 -- RPM-GPG-KEY-rpmfusion-nonfree-fedora-30-primary | 29 -- RPM-GPG-KEY-rpmfusion-nonfree-fedora-31-primary | 29 -- rpmfusion-nonfree-rawhide.repo | 30 --- rpmfusion-nonfree-release.spec | 336 +++--------------------- rpmfusion-nonfree-tainted.repo | 30 +-- rpmfusion-nonfree-updates-testing.repo | 27 +- rpmfusion-nonfree-updates.repo | 30 +-- rpmfusion-nonfree.repo | 33 --- 10 files changed, 80 insertions(+), 522 deletions(-) --- diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec index 62913a7..0b38463 100644 --- a/rpmfusion-nonfree-release.spec +++ b/rpmfusion-nonfree-release.spec @@ -1,44 +1,45 @@ #global repo free %global repo nonfree -%global israwhide 1 Name: rpmfusion-%{repo}-release -Version: 30 -Release: 0.2 +Version: 8 +Release: 0.1 Summary: RPM Fusion (%{repo}) Repository Configuration License: BSD URL: http://rpmfusion.org -Source1: rpmfusion-%{repo}.repo +Source0: RPM-GPG-KEY-rpmfusion-%{repo}-el-8 +# not needed for now, but maybe we'll do that later: +# Source1: rpmfusion-%{repo}.repo Source2: rpmfusion-%{repo}-updates.repo Source3: rpmfusion-%{repo}-updates-testing.repo -Source4: rpmfusion-%{repo}-rawhide.repo Source5: rpmfusion-%{repo}-tainted.repo -Source29: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-29-primary -Source30: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-30-primary -Source31: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-31-primary BuildArch: noarch -Requires: system-release(%{version}) -Provides: rpmfusion-%{repo}-repos(%{version}) +Requires: redhat-release >= %{version} +Requires: epel-release >= %{version} -%if 0%{?israwhide} -Obsoletes: %{name}-rawhide < %{version}-%{release} -Provides: %{name}-rawhide = %{version}-%{release} -%endif - -%description -RPM Fusion %{repo} package repository files for yum and dnf -along with gpg public keys +%if %{repo} == "nonfree" +Requires: rpmfusion-free-release >= %{version} -%if ! 0%{?israwhide} -%package rawhide -Summary: RPM Fusion Rawhide %{repo} repo definitions -Requires: %{name} = %{version}-%{release} +%description +RPM Fusion repository contains open source and other distributable software for +EL + EPEL. It is the merger of the Dribble, FreshRPMs and Livna repositories. + +This package contains the RPM Fusion GPG key as well as Yum package manager +configuration files for RPM Fusion's "nonfree" repository, which holds +software that is not considered as Open Source Software according to the +Fedora packaging guidelines. +%else +%description +RPM Fusion repository contains open source and other distributable software for +EL + EPEL. It is the merger of the Dribble, FreshRPMs and Livna repositories. -%description rawhide -This package provides the RPM Fusion rawhide %{repo} repo definitions. +This package contains the RPM Fusion GPG key as well as Yum package manager +configuration files for RPM Fusion's "free" repository, which holds only +software that is considered as Open Source Software according to the Fedora +packaging guidelines. %endif %package tainted @@ -59,304 +60,47 @@ echo "Nothing to prep" echo "Nothing to build" %install - # Create dirs install -d -m755 \ %{buildroot}%{_sysconfdir}/pki/rpm-gpg \ %{buildroot}%{_sysconfdir}/yum.repos.d # GPG Key -%{__install} -Dp -m644 \ - %{SOURCE29} \ - %{SOURCE30} \ - %{SOURCE31} \ - %{buildroot}%{_sysconfdir}/pki/rpm-gpg - -# Avoid using basearch in name for the key. Introduced in F18 -ln -s $(basename %{SOURCE29}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-29 -ln -s $(basename %{SOURCE30}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-30 -ln -s $(basename %{SOURCE31}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-31 - -# Links for the keys -ln -s $(basename %{SOURCE30}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest -ln -s $(basename %{SOURCE31}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide - +%{__install} -Dp -m644 %{SOURCE0} \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg # Yum .repo files %{__install} -p -m644 \ - %{SOURCE1} \ %{SOURCE2} \ %{SOURCE3} \ - %{SOURCE4} \ %{SOURCE5} \ %{buildroot}%{_sysconfdir}/yum.repos.d - %files %config %{_sysconfdir}/pki/rpm-gpg/* -%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-updates*.repo -%if ! 0%{?israwhide} -%files rawhide -%endif -%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-rawhide.repo - %files tainted %config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo %changelog -* Thu Oct 18 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 30-0.2 -- Remove f28 key -- Add f31 key +* Wed Jan 09 2019 Xavier Bachelot <xavier(a)bachelot.org&gt; - 8-0.1 +- Release for EL-8. -* Thu Aug 23 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 30-0.1 -- Bump for 30 +* Tue Jun 19 2018 Xavier Bachelot <xavier(a)bachelot.org&gt; - 7-4 +- Don't use $releasever, it's not expanding as expected on RHEL (RFBZ#4943). -* Tue Apr 17 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 29-0.4 -- Remove compatibility symlink +* Tue Jun 19 2018 Xavier Bachelot <xavier(a)bachelot.org&gt; - 7-3 +- Only include tainted repo definition in tainted sub-package. -* Mon Apr 16 2018 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 29-0.3 -- Enable metadata -- Remove f27 key -- Add f30 key - -* Mon Mar 19 2018 Xavier Bachelot <xavier(a)bachelot.org&gt; - 29-0.2 +* Mon Mar 19 2018 Xavier Bachelot <xavier(a)bachelot.org&gt; - 7-2 - Create sub-package for tainted repo. -* Mon Mar 05 2018 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 29-0.1 -- Bump to 29 - -* Mon Nov 13 2017 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 28-0.3 -- Add f29 key -- Remove f26 key - -* Wed Sep 06 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 28-0.1 -- Bump for 28 - -* Fri Jul 07 2017 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 27-0.3 -- Bump for f26 key - -* Tue Mar 28 2017 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 27-0.2 -- Bump for 27 - -* Tue Mar 28 2017 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 26-0.5 -- Add Zypper compatibility, patch by Neal Gompa - rfbz#4481 - -* Fri Nov 18 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 26-0.4 -- Add f26/f27 keys -- Remove f23/f24 keys -- Clean-up Description -- Improve Requires/Provides -- Drop dependency on free from nonfree -- Add a rawhide sub-package - rfbz#3223 -- Mark gpg keys as %%config - -* Wed Nov 02 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 26-0.3 -- Add metalink over https - -* Wed Aug 24 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 26-0.2 -- Fix current symlink and f25 symlink - -* Sat Aug 06 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 26-0.1 -- Bump for f26 - -* Fri Jun 24 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 25-0.2 -- Bump for rawhide release - -* Sun May 15 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 25-0.1 -- Update to 25 - -* Sat May 14 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 24-0.1 -- Update to 24 - -* Sat Oct 24 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 23-0.1 -- Bump for branched/f23 - -* Sat May 23 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 22-1 -- Update to Final F-22 - -* Tue May 05 2015 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 22-0.1 -- Bump for branched/f22 - -* Mon Dec 08 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 21-1 -- Update to Final F-21 - -* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 21-0.1 -- Bump for Rawhide/F-21 - -* Sun Dec 15 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 20-1 -- Update to f20 final - -* Fri Jun 28 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 20-0.2 -- Add key for Rawhide/F-21 -- Spec file clean-up - -* Mon Mar 18 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 20-0.1 -- Build for Rawhide/F-20 - -* Thu Mar 14 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 19-0.4 -- Fix GPG's key name - -* Wed Mar 13 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 19-0.3 -- Branch F-19 - -* Tue Jan 01 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 19-0.2 -- Add key for Rawhide/F-20 - -* Mon Aug 20 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 19-0.1 -- Build for Rawhide/F-19 - -* Wed Aug 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 18-0.2 -- Bump for Branched/F-18 - -* Fri May 18 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 18-0.1 -- Build for Rawhide/F-18 - -* Fri May 18 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 17-1 -- Update to final 17 - -* Tue Mar 06 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 17-0.5 -- Bump - -* Mon Feb 27 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 17-0.4 -- Split to development/17 -- Enable rpmfusion*-updates-testing - -* Sat Feb 11 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 17-0.3 -- Bump for branched F-17 - -* Sat Nov 19 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 17-0.1 -- build for rawhide/F-17 -- Drop key for F-15 - -* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 16-1.2 -- Fix compat key for F-15 -- Fix Installation of F-17 key - -* Thu Oct 27 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 16-1 -- Add keys for Rawhide/F-17 -- Build for F-16 - -* Sun Jun 05 2011 Thorsten Leemhuis <fedora at leemhuis.info> - 16.1 -- build for rawhide/F-16 - -* Sat May 28 2011 Thorsten Leemhuis <fedora at leemhuis.info> - 15-1 -- Add keys for Rawhide/F16 -- Build for F-15 - -* Sat Oct 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.4 -- drop ppc -- add key for F-15, drop the one for F-13 - -* Sun Oct 10 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.3 -- branching for F14: disable rawhide, enable everything and updates - -* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.2 -- fix compatibility symlink - -* Sat Apr 24 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.1 -- rebuild for rawhide - -* Fri Apr 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 13-1 -- add key for Rawhide/F14 -- remove key for F12 - -* Sun Nov 22 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 13-0.1 -- Bump for Fedora 13's rawhide. -- Put the version at 13 from the start. -- drop post script - -* Sun Nov 15 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 12-1 -- F12 release: disable rawhide, enable everything and updates -- remove key for F11 -- add key for F13 - -* Thu Jun 11 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11.90-1 -- build for rawhide (enable rawhide, disable all the other repos) - -* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11-1 -- F11 release: disable rawhide, enable everything and updates -- use "metadata_expire=7d" for everything repos -- Track in some changes from 10-{34} (myself): --- remove old comments to obsolete release packages from freshrpms, dribble and livna --- add proper links for rawhide --- add key for F12 --- some small adjustments to the spec --- add post script that switch old config files from serverside mirrorlists to - mirrormanager -- Track in some changes from 10-{23} (Till Maas): --- fix symlinks --- allow easy transition to F11 with new gpg key and naming structure - -* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10-4 -- add key for F12 -- some small adjustments to the spec -- add post script that switch old config files from serverside mirrorlists to - mirrormanager - -* Sat May 16 2009 Till Maas <opensource(a)till.name&gt; - 10-3 -- fix symlinks - -* Sat May 16 2009 Till Maas <opensource(a)till.name&gt; - 10-2 -- allow easy transition to F11 with new gpg key and naming structure - -* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.90-3 -- rebuild for new F11 features - -* Sat Mar 21 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10.90-2 -- add new key for SHA256 signatures -- use the same structure for keys as fedora does - -* Wed Nov 26 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 10.90-1 -- Initial build for Fedora 11. - -* Sat Nov 15 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 10-1 -- build for F-10 - -* Mon Nov 03 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-5 -- enable the proper mirrormanager server in the repo files - -* Sat Oct 04 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-4 -- require system-release instead of fedora-release - -* Tue Sep 30 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-3 -- s|download.rpmfusion.org|download1.rpmfusion.org|' *.repo -- s|basearch/debug/|basearch/os/debug/|" in *rawhide.repo - -* Sun Sep 28 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-2 -- Fix rpmfusion-rpmfusion typo (again) -- update summary to properly say free or nonfree - -* Sat Sep 27 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-1 -- Update for Fedora 10 rawhide -- enable devel repos, disable all the others - -* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-7 -- Use temporary mirrorlists for now, and baseurl for the debug & source repos - -* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-6 -- Fix rpmfusion-rpmfusion typo - -* Mon Aug 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-5 -- Use mirrors.rpmfusion.org instead of rpmfusion.org/mirrorlist -- Use download.rpmfusion.org instead of download1.rpmfusion.org - -* Fri Aug 15 2008 Stewart Adam <s.adam at diffingo.com> - 9-4 -- Only include provides/obsoletes for pre-merger release RPMs in nonfree -- Remove GPL doc - -* Thu Aug 14 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9-3 -- add conditionals and macros to use one spec file for both free and nonfree -- some cleanups - -* Wed Aug 13 2008 Stewart Adam <s.adam at diffingo.com> - 9-2 -- Split into free and non-free RPMs based on original release RPM -- Remove double BuildArch -- Remove GPL source -- Fix mirror URLs -- devel --> rawhide +* Thu Sep 15 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 7-1 +- Release for EL-7 -* Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 9-1 -- Initial RPM release +* Tue Jun 19 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6-1 +- Release for EL-6 +* Sun May 01 2011 Robert Scheck <robert(a)fedoraproject.org&gt; 6-0.1 +- Initial RPM release based on Thorsten Leemhuis' work for EL-5 diff --git a/rpmfusion-nonfree-tainted.repo b/rpmfusion-nonfree-tainted.repo index ee408aa..f6465c4 100644 --- a/rpmfusion-nonfree-tainted.repo +++ b/rpmfusion-nonfree-tainted.repo @@ -1,33 +1,33 @@ [rpmfusion-nonfree-tainted] -name=RPM Fusion for Fedora $releasever - Nonfree tainted -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch +name=RPM Fusion for EL 8 - Nonfree tainted +#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/8/$basearch/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-8&arch=$basearch enabled=1 -metadata_expire=14d +metadata_expire=6h type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8 [rpmfusion-nonfree-tainted-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree tainted - Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch +name=RPM Fusion for EL 8 - Nonfree tainted - Debug +#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/8/$basearch/debug/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-debug-8&arch=$basearch enabled=0 -metadata_expire=7d +metadata_expire=6h type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8 [rpmfusion-nonfree-tainted-source] -name=RPM Fusion for Fedora $releasever - Nonfree tainted - Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch +name=RPM Fusion for EL 8 - Nonfree tainted - Source +#baseurl=http://download1.rpmfusion.org/nonfree/el/tainted/8/SRPMS/ +metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-el-tainted-source-8&arch=$basearch enabled=0 -metadata_expire=7d +metadata_expire=6h type=rpm-md gpgcheck=1 repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8 diff --git a/rpmfusion-nonfree-updates-testing.repo b/rpmfusion-nonfree-updates-testing.repo index 90ba1c0..c5292a2 100644 --- a/rpmfusion-nonfree-updates-testing.repo +++ b/rpmfusion-nonfree-updates-testing.repo @@ -1,30 +1,27 @@ [rpmfusion-nonfree-updates-testing] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-$releasever&arch=$basearch +name=RPM Fusion for EL 8 - Nonfree - Test Updates +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/testing/8/$basearch/ +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-testing-8&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8 [rpmfusion-nonfree-updates-testing-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-debug-$releasever&arch=$basearch +name=RPM Fusion for EL 8 - Nonfree - Test Updates Debug +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/testing/8/$basearch/debug/ +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-testing-debug-8&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8 [rpmfusion-nonfree-updates-testing-source] -name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-testing-source-$releasever&arch=$basearch +name=RPM Fusion for EL 8 - Nonfree - Test Updates Source +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/testing/8/SRPMS/ +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-testing-source-8&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8 diff --git a/rpmfusion-nonfree-updates.repo b/rpmfusion-nonfree-updates.repo index f41d15e..3f91245 100644 --- a/rpmfusion-nonfree-updates.repo +++ b/rpmfusion-nonfree-updates.repo @@ -1,30 +1,26 @@ [rpmfusion-nonfree-updates] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch -enabled=0 -type=rpm-md +name=RPM Fusion for EL 8 - Nonfree - Updates +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/8/$basearch/ +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-released-8&arch=$basearch +enabled=1 gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8 [rpmfusion-nonfree-updates-debuginfo] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch +name=RPM Fusion for EL 8 - Nonfree - Updates Debug +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/8/$basearch/debug/ +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-released-debug-8&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8 [rpmfusion-nonfree-updates-source] -name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source -#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/ -metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch +name=RPM Fusion for EL 8 - Nonfree - Updates Source +#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/8/SRPMS/ +mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-released-source-8&arch=$basearch enabled=0 type=rpm-md gpgcheck=1 -repo_gpgcheck=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-8