[rpmfusion-free-release/f25] Update to 25 final

commit 9f78bf92cb4a8abc9c7f5608f7b0cfff8fb2ad50 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Fri Nov 18 20:11:56 2016 +0100 Update to 25 final rpmfusion-free-release.spec | 40 ++++++++++++++++--------------------- rpmfusion-free-updates-testing.repo | 2 +- rpmfusion-free-updates.repo | 2 +- rpmfusion-free.repo | 2 +- 4 files changed, 20 insertions(+), 26 deletions(-) --- diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec index 9dc4552..d0e2d2c 100644 --- a/rpmfusion-free-release.spec +++ b/rpmfusion-free-release.spec @@ -3,7 +3,7 @@ Name: rpmfusion-%{repo}-release Version: 25 -Release: 0.7 +Release: 1 Summary: RPM Fusion (%{repo}) Repository Configuration Group: System Environment/Base @@ -16,32 +16,18 @@ Source4: rpmfusion-%{repo}-rawhide.repo Source23: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-23-primary Source24: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-24-primary Source25: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-25-primary +Source26: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-26-primary +Source27: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-27-primary BuildArch: noarch -Requires: system-release >= %{version} +Requires: system-release(%{version}) +Provides: rpmfusion-%{repo}-repos(%{version}) -%if %{repo} == "nonfree" -Requires: rpmfusion-free-release >= %{version} - -%description -RPM Fusion repository contains open source and other distributable software for -Fedora. 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 -Fedora. It is the merger of the Dribble, FreshRPMs and Livna repositories. +RPM Fusion %{repo} package repository files for yum and dnf +along with gpg public keys -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 %prep echo "Nothing to prep" @@ -70,10 +56,12 @@ ln -s $(basename %{SOURCE24}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- ln -s $(basename %{SOURCE23}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-23 ln -s $(basename %{SOURCE24}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-24 ln -s $(basename %{SOURCE25}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-25 +ln -s $(basename %{SOURCE26}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-26 +ln -s $(basename %{SOURCE27}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-27 # Links for the keys -ln -s $(basename %{SOURCE24}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest -ln -s $(basename %{SOURCE25}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide +ln -s $(basename %{SOURCE26}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest +ln -s $(basename %{SOURCE27}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide # Yum .repo files @@ -86,6 +74,12 @@ ln -s $(basename %{SOURCE25}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG- %config(noreplace) %{_sysconfdir}/yum.repos.d/* %changelog +* Fri Nov 18 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 25-1 +- Update to final f25 +- Clean-up Description +- Improve Requires/Provides +- Drop dependency on free from nonfree + * Wed Nov 02 2016 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 25-0.7 - Add metalink over https diff --git a/rpmfusion-free-updates-testing.repo b/rpmfusion-free-updates-testing.repo index d9cc2de..9b8b7be 100644 --- a/rpmfusion-free-updates-testing.repo +++ b/rpmfusion-free-updates-testing.repo @@ -2,7 +2,7 @@ name=RPM Fusion for Fedora $releasever - Free - Test Updates #baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/ metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-... -enabled=1 +enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever diff --git a/rpmfusion-free-updates.repo b/rpmfusion-free-updates.repo index 3ab2e82..d71449f 100644 --- a/rpmfusion-free-updates.repo +++ b/rpmfusion-free-updates.repo @@ -2,7 +2,7 @@ name=RPM Fusion for Fedora $releasever - Free - Updates #baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/ metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-... -enabled=0 +enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever diff --git a/rpmfusion-free.repo b/rpmfusion-free.repo index 8b5823d..c42d286 100644 --- a/rpmfusion-free.repo +++ b/rpmfusion-free.repo @@ -3,7 +3,7 @@ name=RPM Fusion for Fedora $releasever - Free #baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/ metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$release... enabled=1 -#metadata_expire=14d +metadata_expire=14d gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever