Author: kwizart Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18529/F-18 Modified Files: rpmfusion-nonfree-rawhide.repo rpmfusion-nonfree-release.spec rpmfusion-nonfree-updates-testing.repo rpmfusion-nonfree-updates.repo rpmfusion-nonfree.repo Added Files: RPM-GPG-KEY-rpmfusion-nonfree-fedora-20-primary Removed Files: RPM-GPG-KEY-rpmfusion-nonfree-fedora-17-primary Log Message: Update to release 18 --- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-fedora-20-primary --- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.12 (GNU/Linux) mQINBFDjFwEBEADZMa0qnUSLgJ96uYL4VdbRQebbr2IeCweDWJbADZA462uXXu/i UO0hZOxE1oXogMRFWAZOcFQeg2NgSv+zStLGaB0ojon/zMsRa99uEDDzc8zZsJm0 n0ssUjQHginGrhUpqAxHiy8iUNbUzrRvwNT37Jq3qTh9g9+Z4GqFRQdcLSyTKqQ7 RZE1Kbx1dGq6EzmGhzHZNjacU8A/GtIHQT/zXNFtqtMKBzGoWuwm2kc1yqmIS6sg ryiZ6ESlaqS/GQBd2pRmQO/+VlnZqBQyWvxJ4KiP+Ck0CGx8vJNQk2Z1Ug0uExdu Z1H1Ml9QpZRx6T2QTu/4DmocdTzgXouNJl1u9jVpPPrg4dGmrEpIXF4PNmkQEqQT 4zLi30MDIWwaZ16hmvOMlGJTuH825en5pS0oeUtexLe3qR8IhMicoMYda7WXZ6WN C1V8ZMu6O9mRcYgVk7dKgm09XoIYmnPR/yaQduNYIAEPRs7krPNBHi/++CNMcdJo /qfD8u+znJds1bv+hjMolzZenIrhc3GM5tP2FSmZsyOIQV3v5aZsFI3g4LO3GF+4 HYONnD3yxZIpXSaJJ36AFzSJM7dFx+OjxzUJP8aOCgc3jM0dhFNodhAl+/aqCzaJ KBCzumqblAsYGXldzpAwGs1QhD3BjBTuyuwKoMFLGmgGSI3pxDNX6VeoeQARAQAB tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMCkg PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIA IgUCUOMXAQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQY8DejLXymIPg EBAApGuEq6bIBhkdUmBsbDFDA6HzdgEV3YeWfFc3FubhCcSmPV5yC1sCD/GPW7XX M8iOCmLgEFz9sfN9hSppgMLVQSk30AKxf7gAV58XCjaM17wtbU7SNaX3PSYWTnwc U2KDY9C77cE9atr7cvg8GNW5QHwzTIMez7zqI7reeF+6Me7m6N8ZsawKp6NRtJzs gnq1Lhz26Al6uhR5GrrvbmxIieWR40areJECKV1wKkWW/EaB8dkyn0DZJCcuxciV hpV9O+5Ze1mvBZ6DORj/7iNWfrHUurXYDuM+Xuc41SdX9XaMqB9Hb0KwHVz7ZCUo O6ULDrtP+9OGhNqSDN11/8j3Wqih98PP63b+UwWGNTvbiglgUmd7kodqIawQfqtw d9oCgD67Qky83rxT9sZh5hz6ZLfuRNJb61R9h2lzZze8SyzKqRDCuYW6Y6c2Jp8q 2NMMD2Njb5WC/+4xjr6ihRU0qz3nIV9F73mVX0mZekT3hNxnszT4KlV5QMZ31tok AvN1wH+wYoUxKQxw+zphgNNZLD1wEYDD/zkjKxnj3z3A74M2wsVLu322iEOXS/Ec SoXGra0D53LURrXGS7KzVrF0kdVPoXY20O1i5FlgdO0+y+jbjV3hVYlW1XOSc2h+ XW6jUiO8fQF8PTF1f42m12Ywyq3DETyoubpv5dvKredYVBk= =3dNj -----END PGP PUBLIC KEY BLOCK----- Index: rpmfusion-nonfree-rawhide.repo =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-18/rpmfusion-nonfree-rawhide.repo,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- rpmfusion-nonfree-rawhide.repo 8 Aug 2012 16:33:01 -0000 1.19 +++ rpmfusion-nonfree-rawhide.repo 1 Jan 2013 19:41:21 -0000 1.20 @@ -4,7 +4,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-ra... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide-$basearch +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 [rpmfusion-nonfree-rawhide-debuginfo] name=RPM Fusion for Fedora Rawhide - Nonfree - Debug @@ -12,7 +12,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-ra... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide-$basearch +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 [rpmfusion-nonfree-rawhide-source] name=RPM Fusion for Fedora Rawhide - Nonfree - Source @@ -20,5 +20,5 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-ra... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide-$basearch +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/F-18/rpmfusion-nonfree-release.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- rpmfusion-nonfree-release.spec 22 Dec 2012 06:13:47 -0000 1.32 +++ rpmfusion-nonfree-release.spec 1 Jan 2013 19:41:21 -0000 1.33 @@ -3,7 +3,7 @@ Name: rpmfusion-%{repo}-release Version: 18 -Release: 0.5 +Release: 1 Summary: RPM Fusion (%{repo}) Repository Configuration Group: System Environment/Base @@ -13,9 +13,9 @@ Source2: rpmfusion-%{repo}-updates.repo Source3: rpmfusion-%{repo}-updates-testing.repo Source4: rpmfusion-%{repo}-rawhide.repo -Source17: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-17-primary Source18: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-primary Source19: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-19-primary +Source20: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-20-primary BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -62,21 +62,17 @@ # GPG Key %{__install} -Dp -m644 \ - %{SOURCE17} \ %{SOURCE18} \ %{SOURCE19} \ + %{SOURCE20} \ $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg # compatibility symlink for easy transition to F11 -ln -s $(basename %{SOURCE17}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora +ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora # Links for the keys -for i in i386 x86_64 arm armhfp ppc ppc64; do - ln -s $(basename %{SOURCE17}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-17-${i} - ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-18-${i} - ln -s $(basename %{SOURCE18}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest-${i} - ln -s $(basename %{SOURCE19}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide-${i} -done +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 # Yum .repo files @@ -93,6 +89,10 @@ %config(noreplace) %{_sysconfdir}/yum.repos.d/* %changelog +* Tue Jan 01 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 18-1 +- Update to final 18 +- Remove basearch from the gpg key + * Sat Dec 22 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 18-0.5 - Disable updates-testing - Add symlinks for secondary Index: rpmfusion-nonfree-updates-testing.repo =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-18/rpmfusion-nonfree-updates-testing.repo,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rpmfusion-nonfree-updates-testing.repo 22 Dec 2012 06:13:47 -0000 1.9 +++ rpmfusion-nonfree-updates-testing.repo 1 Jan 2013 19:41:21 -0000 1.10 @@ -4,7 +4,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever [rpmfusion-nonfree-updates-testing-debuginfo] name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Debug @@ -12,7 +12,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever [rpmfusion-nonfree-updates-testing-source] name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Source @@ -20,5 +20,5 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch +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/F-18/rpmfusion-nonfree-updates.repo,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- rpmfusion-nonfree-updates.repo 21 Sep 2012 09:43:46 -0000 1.17 +++ rpmfusion-nonfree-updates.repo 1 Jan 2013 19:41:21 -0000 1.18 @@ -4,7 +4,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=1 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever [rpmfusion-nonfree-updates-debuginfo] name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug @@ -12,7 +12,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever [rpmfusion-nonfree-updates-source] name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source @@ -20,5 +20,5 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch +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/F-18/rpmfusion-nonfree.repo,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- rpmfusion-nonfree.repo 21 Sep 2012 09:43:46 -0000 1.19 +++ rpmfusion-nonfree.repo 1 Jan 2013 19:41:21 -0000 1.20 @@ -3,9 +3,9 @@ #baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$r... enabled=1 -#metadata_expire=7d +metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever [rpmfusion-nonfree-debuginfo] name=RPM Fusion for Fedora $releasever - Nonfree - Debug @@ -14,7 +14,7 @@ enabled=0 metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever [rpmfusion-nonfree-source] name=RPM Fusion for Fedora $releasever - Nonfree - Source @@ -23,5 +23,5 @@ enabled=0 metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever --- RPM-GPG-KEY-rpmfusion-nonfree-fedora-17-primary DELETED ---