Author: thl Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv7565 Modified Files: rpmfusion-nonfree-release.spec Added Files: RPM-GPG-KEY-rpmfusion-nonfree-fedora-13-primary RPM-GPG-KEY-rpmfusion-nonfree-fedora-14-primary Log Message: * Fri Apr 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 11-2 - Add keys for F13 and Rawhide/F14 - mark config file as noreplace which was missing for some strange reason --- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-fedora-13-primary --- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.5 (GNU/Linux) mQINBEr/7bcBEADR9g8j2q5iI+NUJ6ZHS5yht56nPP4I9US/HcPs6PsozMtT0H3j eLA+nH6DSn9rVUTS84anaUB6uSf/yzd5yUibnw4XZ6ZE7MaEjM/GIRymRqkV7sIX ZTDU88mv3KIHbjC611iROfkH7l8Dl3aWRWOp1XY/G8LIxVC5ExzSFHRI02VXo6nM UpnxEoysyvcVsm+gmnnRYDnwN7edYt0M4vHeRcedKu8uhzqw2dBwiSzZssCIZR7/ qejEJQwSZuEjf7hN7iGIhjQcfrNCxHdcGk8/1tZL2XnDZe/Uxe28nfUTe5wGfufY Y70sr3Bnx0eJc/nsGH7RHSBSII2NNXZPmvCSMx0wfNUxq37kok8XkUwL+crV/YIw 7lcUWTEDY1Y3VAto1uF5EXdrWrSjhmArVMOxiGDYCUyyaBZw84tlI0wq/PKeHYuy nDK6JNGa+ZN9Hr/houp7wqxoXOv6SfnAvTGKH0QAsSSAiPQQzDDZReT+rDw+PKmD Y+TYVMDoh/hafSFmGOAjShoIl/1PBwy+U0ncMelMvwB0kMR95ygheFe29hDYJH06 hiX6H9kBTZtvImsKwEwOiPozA1UZdknvyP+2cHcoOClg+uZFeq7aFJ/E5Fw72RO9 iy8YFeQoN84QAQpOm1rl3GGnGFRLPEGGi92KPXUvvHvaP+cqjGPnFtBhbQARAQAB tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxMykg PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCNgQTAQIA IAUCSv/ttwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJECvvL9IkJbKEGksQ AIAK65TxLFj+F4JjRFyd1YvhEUbJKoTpgZ9r4Sz7hcVDOdvnesHugcERvzGrDgd4 XrmKd0bojBHPTQYROUQ6tu85KdYABZOQTOuB6vKxXVbZgvfNqJzuqsMUklma6uGo L0Cy9W6H3YmzmtaupuxCW5HBvWzN3OjXH7KQmW4enH8+2qy1p1mDSHyFuBJoF6UE 8Jf0q9dsjYArTrTbGFl6n8vrdGCbKHXhGW9J8gsyOIXo8yZzYEkytujjydtr3R/9 A8LpLeHNiPGU/hnNPHVYZPnYcT7XLy8uhwTgBvhglCVlp9ouZjhPomfqw/qNmjWh zDY7lYtEIKeywweOGw9Ft/WCgFlB7X3V4OLK3P2c9HGoAQ1WAohU5Y8gpqyrSt0d fs7PrlHoZbYG7bEPc3x9VXAcnMc+FGYP7X1J/lNXWNvqaBrBp8dB73FcNHJOGfa8 x25V8Tnq1aqCwUS+BQQCSdz637PZrx6KjcTRRLuiEU1KiNeCgFJP6jyffzkbpLPl PtNTrD76qoQfNPZqQKlDTwcIii6Yo87SWOvXBZvokrArPxWTFs9fcuHXBS2axHg3 cLRUC03TASCDSz6WtygouphUBAtDgSC71DLlCbIN8EmXN6C0sSB5Ywnzdsy7yIT2 2yrVZna0hI/wBR+AqW8jszgJ5JVdEDftqSAKBUxXKela =3/KO -----END PGP PUBLIC KEY BLOCK----- --- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-fedora-14-primary --- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.5 (GNU/Linux) mQINBEvImdMBEADUrJODm0c5tQwAoLEb+T3gstWQQkwNo6hV8reW9veFg1V9aNhw pGcTO8vGpA4lqWNqIjc/Pz8T/AEz752GydJ/g7qC52qo2p+LaWCxqYRKg4pJyua2 srf8z19mYqSXbAT8HKdagCROs3Of/R8T9PLm+KXsWv6jIWUWO3O9utKkoRPUYUrU RjyGbXqSU/QoTN7M/AzgfROefLkusAVAQ21LfBU03G1VGEVY7+s+r0XTVlxpGkDv qAXVeZyabx8CuaORnADFx8bmvmw+6iqy+tI2AYQKyIPApR4eHVXavFZAN2oRfh4f YYsShPf4QQdGh+G3oi/M41V75olnzKkmit9j7lGkfDjc7k3hgjVyMzukwioV5MoK Srs8krKrE+oq3ikRkNZtRvcJWOGo/YtKi99/CTaoCkGA06FvpOrQF9O/gSBC1pMT /GH9bIvQ+dy5pTLAk+7sS/YbymbQHUNf9cllBkFisKpf3PNxWHjhEOBJDJLUs4vM qtl5qXnk3DOBdvzK2r3n/9nLzX9XXobAvzX9oTEKcagyVoWPTMJ6kMWK0LB40Czo 3V4UGCzHXtgPcvvsafY7POsDxSSqwjzo9ZjKqcT5hwYS3c87jbbH8qQuP5C8rd5J G3fvAmn2SaIa+45IMxRGnX8b0Wda0iZdcTZcZIvV3kz2GRWqAZ2R1J7QnQARAQAB tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxNCkg PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCNgQTAQIA IAUCS8iZ0wIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEIBki1PwnYNo7TkP /0/x2rGozlXTCarNIpk/Cw1+5sxPpApXHamGz0tQgOoq/1MRQHuDQbffyKZSqzrE 9bZ2Li9OmLv7F3s/E6H93AqStoY/9HGzAyyFLEBlpe2pIh320RRxGNqLF/zw1KeP ZLfAHjXOUEfkuMdKwPGHWiORSVbDFCL47XLRO6R1ZeNPokBziam2QKPGnNfCeSa7 knwlrIoHs0zlQ3REbPzDXQiC2lzl54npOiCJ6HUFHkkTCiFpK7GOcW/sWz9n2iCN EO1owEaV5VZQf8WnDKqbbmp3tCLL4+6HWo0xmnUt5u6umE1gFp8L1bLd/VnJyQLl Czrs6/R/mzqMh+C6fHekFxt40eU/TIasiMwRpv8bxTLD4ByKwLj/pbX0MAjGWa+q GslxszVujFosty8ezvlNf7ar/U3IUc90Dnb200eqt7eZp9AuT4vb5AF1OlpFsI2p bqGG4r3zdupH+B2SzgmuktsMPjJ2PkKowB3M0eXXOvjhRLVTE/qsZQI/NEVsBzDP Lf4On8xPfXZf2UPshLAgIKX/BzVT+d3YCJ3vsGrLHME5Aq9HD9TmMo5MH8B2Sj5i aCp0SmFNvUI1sdYRrm+EOOtbJ13ogUsCHFCW4u7k2x83/dvW6b+1xb8Hn7rP/I57 +4XRSSuJjiIigIDfGnB9FHq6BcgyF3un1VElPXos93Sb =ULD7 -----END PGP PUBLIC KEY BLOCK----- Index: rpmfusion-nonfree-release.spec =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-11/rpmfusion-nonfree-release.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- rpmfusion-nonfree-release.spec 17 May 2009 15:20:09 -0000 1.11 +++ rpmfusion-nonfree-release.spec 16 Apr 2010 17:50:35 -0000 1.12 @@ -3,7 +3,7 @@ Name: rpmfusion-%{repo}-release Version: 11 -Release: 1 +Release: 2 Summary: RPM Fusion (%{repo}) Repository Configuration Group: System Environment/Base @@ -15,6 +15,8 @@ Source4: rpmfusion-%{repo}-rawhide.repo Source11: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-11-primary Source12: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-12-primary +Source13: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-13-primary +Source14: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-14-primary BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -60,7 +62,11 @@ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d # GPG Key -%{__install} -Dp -m644 %{SOURCE11} %{SOURCE12} \ +%{__install} -Dp -m644 \ + %{SOURCE11} \ + %{SOURCE12} \ + %{SOURCE13} \ + %{SOURCE14} \ $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg # compatibility symlink for easy transition to F11 @@ -70,14 +76,17 @@ for i in i386 x86_64 ppc ppc64; do ln -s $(basename %{SOURCE11}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-11-${i} ln -s $(basename %{SOURCE12}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-12-${i} - ln -s $(basename %{SOURCE11}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest-${i} - ln -s $(basename %{SOURCE12}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide-${i} + ln -s $(basename %{SOURCE13}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-13-${i} + ln -s $(basename %{SOURCE14}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-14-${i} + ln -s $(basename %{SOURCE13}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest-${i} + ln -s $(basename %{SOURCE14}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide-${i} done # Yum .repo files %{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d + %post if grep 'mirrorlist=http://download1.rpmfusion.org/' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}.repo &> /dev/null ; then sed -i 's!mirrorlist=http://download1.rpmfusion.org/%{repo}/fedora/.mirrorlist-%{repo}-fedora-releases$!mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=%{repo}-fedora-$releasever\&arch=$basearch!' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}.repo @@ -93,9 +102,13 @@ %files %defattr(-,root,root,-) %{_sysconfdir}/pki/rpm-gpg/* -%config %{_sysconfdir}/yum.repos.d/* +%config(noreplace) %{_sysconfdir}/yum.repos.d/* %changelog +* Fri Apr 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 11-2 +- Add keys for F13 and Rawhide/F14 +- mark config file as noreplace which was missing for some strange reason + * 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