rpms/rpmfusion-nonfree-release/devel RPM-GPG-KEY-rpmfusion-nonfree-fedora-14-primary, NONE, 1.1 rpmfusion-nonfree-release.spec, 1.14, 1.15 RPM-GPG-KEY-rpmfusion-nonfree-fedora-12-primary, 1.1, NONE

[Thorsten Leemhuis]

Author: thl

Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22163

Modified Files:
	rpmfusion-nonfree-release.spec 
Added Files:
	RPM-GPG-KEY-rpmfusion-nonfree-fedora-14-primary 
Removed Files:
	RPM-GPG-KEY-rpmfusion-nonfree-fedora-12-primary 
Log Message:
* Sat Apr 24 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.1
- rebuild for rawhide



--- 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/devel/rpmfusion-nonfree-release.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rpmfusion-nonfree-release.spec	22 Nov 2009 13:44:09 -0000	1.14
+++ rpmfusion-nonfree-release.spec	24 Apr 2010 18:09:42 -0000	1.15
@@ -2,7 +2,7 @@
 %define repo nonfree
 
 Name:           rpmfusion-%{repo}-release
-Version:        13
+Version:        14
 Release:        0.1
 Summary:        RPM Fusion (%{repo}) Repository Configuration
 
@@ -13,8 +13,8 @@
 Source2:        rpmfusion-%{repo}-updates.repo
 Source3:        rpmfusion-%{repo}-updates-testing.repo
 Source4:        rpmfusion-%{repo}-rawhide.repo
-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 +60,9 @@
   $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
 
 # GPG Key
-%{__install} -Dp -m644 %{SOURCE12} %{SOURCE13} \
+%{__install} -Dp -m644 \
+    %{SOURCE13} \
+    %{SOURCE14} \
     $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
 
 # compatibility symlink for easy transition to F11
@@ -68,10 +70,10 @@
 
 # Links for the keys
 for i in i386 x86_64 ppc ppc64; do
-  ln -s $(basename %{SOURCE12}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-12-${i}
   ln -s $(basename %{SOURCE13}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-13-${i}
-  ln -s $(basename %{SOURCE12}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest-${i}
-  ln -s $(basename %{SOURCE13}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide-${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
 
 
@@ -79,6 +81,7 @@
 %{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
     $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,7 +91,14 @@
 %config(noreplace) %{_sysconfdir}/yum.repos.d/*
 
 %changelog
-* Sun Nov 22 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 13-1
+* 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
@@ -100,7 +110,6 @@
 
 * Thu Jun 11 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11.90-1
 - build for rawhide (enable rawhide, disable all the other repos)
-- 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
@@ -152,15 +161,19 @@
 - 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-6
+* 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


--- RPM-GPG-KEY-rpmfusion-nonfree-fedora-12-primary DELETED ---