Author: kwizart Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8121/devel Modified Files: rpmfusion-nonfree-rawhide.repo rpmfusion-nonfree-release.spec rpmfusion-nonfree-updates-testing.repo rpmfusion-nonfree-updates.repo rpmfusion-nonfree.repo Log Message: Build for Rawhide/F-20 Index: rpmfusion-nonfree-rawhide.repo =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-rawhide.repo,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- rpmfusion-nonfree-rawhide.repo 13 Mar 2013 20:11:49 -0000 1.22 +++ rpmfusion-nonfree-rawhide.repo 18 Mar 2013 22:40:14 -0000 1.23 @@ -2,7 +2,7 @@ name=RPM Fusion for Fedora Rawhide - Nonfree #baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basearch/os/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-ra... -enabled=0 +enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide Index: rpmfusion-nonfree-release.spec =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-release.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- rpmfusion-nonfree-release.spec 13 Mar 2013 20:11:49 -0000 1.31 +++ rpmfusion-nonfree-release.spec 18 Mar 2013 22:40:14 -0000 1.32 @@ -2,8 +2,8 @@ %define repo nonfree Name: rpmfusion-%{repo}-release -Version: 19 -Release: 0.3 +Version: 20 +Release: 0.1 Summary: RPM Fusion (%{repo}) Repository Configuration Group: System Environment/Base @@ -70,10 +70,22 @@ # compatibility symlink for easy transition to F11 ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora +# Avoid using basearch in name for the key. Introduced in F18 +ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18 +ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19 +ln -s $(basename %{SOURCE20}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-20 + # Links for the keys ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest ln -s $(basename %{SOURCE20}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide +# Compatibility Links for the keys for F-17 > Later update. +# Can be dropped by F-20 +for i in i386 x86_64 arm armhfp ; do + ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-${i} + ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-${i} +done + # Yum .repo files %{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ @@ -89,6 +101,12 @@ %config(noreplace) %{_sysconfdir}/yum.repos.d/* %changelog +* 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 Index: rpmfusion-nonfree-updates-testing.repo =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-updates-testing.repo,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- rpmfusion-nonfree-updates-testing.repo 13 Mar 2013 20:11:49 -0000 1.11 +++ rpmfusion-nonfree-updates-testing.repo 18 Mar 2013 22:40:14 -0000 1.12 @@ -2,7 +2,7 @@ name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates #baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... -enabled=1 +enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever Index: rpmfusion-nonfree-updates.repo =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-updates.repo,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- rpmfusion-nonfree-updates.repo 13 Mar 2013 20:11:49 -0000 1.18 +++ rpmfusion-nonfree-updates.repo 18 Mar 2013 22:40:14 -0000 1.19 @@ -2,7 +2,7 @@ name=RPM Fusion for Fedora $releasever - Nonfree - Updates #baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... -enabled=1 +enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever Index: rpmfusion-nonfree.repo =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree.repo,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- rpmfusion-nonfree.repo 13 Mar 2013 20:11:49 -0000 1.20 +++ rpmfusion-nonfree.repo 18 Mar 2013 22:40:14 -0000 1.21 @@ -2,7 +2,7 @@ name=RPM Fusion for Fedora $releasever - Nonfree #baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$r... -enabled=1 +enabled=0 #metadata_expire=7d gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever