rpms/rpmfusion-nonfree-release/devel RPM-GPG-KEY-rpmfusion-nonfree-fedora-21-primary, NONE, 1.1 rpmfusion-nonfree-release.spec, 1.32, 1.33 RPM-GPG-KEY-rpmfusion-nonfree-fedora-18-primary, 1.1, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7385/devel

Modified Files:
	rpmfusion-nonfree-release.spec 
Added Files:
	RPM-GPG-KEY-rpmfusion-nonfree-fedora-21-primary 
Removed Files:
	RPM-GPG-KEY-rpmfusion-nonfree-fedora-18-primary 
Log Message:
Add key for F-21



--- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-fedora-21-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.13 (GNU/Linux)

mQINBFHN/o4BEADYs5qmEKG5ORh7vXN2NUStj3YMpS5RdjlgBG3PUyLpzSYYrvlF
kBHa9xGrT7LQfTmhT9TtN0fpHA8/343oExO/lZKhDmtgE7/yFUv8LUtHiSxt/sO5
oPaRKZmuHzgJahRwX3kkwCOGcos8GOgJLQF3DojuwH6sScKnB9J+8sBsKQ26WrmE
0mtEcGD0ZxurGEAGeu2D4zA4XWAGukJl4NJDsjoHdVpZyow66AREo9/JV4dXZdd6
jHvUMpOleO1YQyTIoODxPyx2qqUycerZ4QD4kBXW6j8p5gUW9+rIFoqGjrDOfgr8
PwzMJNOlTPNVWRtr4+nN5TgD0WB4WnkY4dM/9le5KECb2neQo11ujj000Jh30Pbb
sf+wWeKu0H7rRDXG4mB15uqTnOydpeg+K1I0SeYogcjLvUfTk9ZBan3lw2t1/bjr
7eIffy2l+FXaa2OtWSM9IkxVg+/2tOMrW2DZUA5uGlhZ+Vtr4pfPfuyAt1mSIFjj
lbO8I2bivyrvgwdTm2YxneGNrK92htzdhq1jvliAGxCzBy4h2sK9os6ft70Jcau4
2fIsiHhpYHk98RXhQKjt/1ULpP8KeJtKE551wtHqfixiRpSVF6DtvyYV7Ix4Ukgr
jAgWWCnJWWF4a+i23Cuyf7hWRae0ukhqQ3UGPhOphjK5xwS3940xY7D3BwARAQAB
tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMSkg
PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIA
IgUCUc3+jgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQAXRG0aZos3ar
uA//Syin1BOi3GPKhDeRXRy3wjfgEWF+zibXOk12o26kQEAUX6tTqOxJ8vl1nt7G
rHnNFKmnY11IqJGb6zwP22e8kBUfUBEcLMwLe7RUdV5VTqkFvpuk+fsihYu6RCUj
kteuwnO57s58QypAkMKRPEtx6ozepq8JUAklMQkdnpasp91r+YA2DzKDSGXCZ1uS
f9FGgrqNLtnpoRdkCrO80mirYyYlak7u5adwH2Z4aVI9kOXPLc0LWc25eoKeo7Lb
hhKg4T58NUDucK+qZb8lTAMQQKnnvOjmnWC0T4SQlWQeffi6xSm8euKjjdbbCd0f
R/1+BsUWWgT+3Sw80prdG591+S5F40JU9PYP7bsCinVKmGneDCIlAISZ7dnTuLkh
s7GuZv8iojpiGR92Ea22pMi09013ZTGwmSr7iwo+j6PRY8MmrflhBQQx8CKb/W7n
IOlBfVHWWQ/n0/9e0iw1YcBu3nno6k8LQQS5LQclnabhq6l8k19ZgC2Y9otjDRPL
NyvQi+5tM2uW8iKEA5bmoNpJlZKKSI7e1UzN9kB3eObRZxq6JU9nzT+E9RYwYTBY
y9VM0pAXaeA8byREEcELhsuku+Kzjs3TF4hEY9lNDKfitr0jropeED/Tb62Z0QO1
f6C5r5Wl8dz0fM+Fj4nstVEhAEVtAwVXl/6ATjs9qwTV+8M=
=r0EG
-----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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rpmfusion-nonfree-release.spec	18 Mar 2013 22:40:14 -0000	1.32
+++ rpmfusion-nonfree-release.spec	28 Jun 2013 21:56:21 -0000	1.33
@@ -3,7 +3,7 @@
 
 Name:           rpmfusion-%{repo}-release
 Version:        20
-Release:        0.1
+Release:        0.2
 Summary:        RPM Fusion (%{repo}) Repository Configuration
 
 Group:          System Environment/Base
@@ -13,16 +13,13 @@
 Source2:        rpmfusion-%{repo}-updates.repo
 Source3:        rpmfusion-%{repo}-updates-testing.repo
 Source4:        rpmfusion-%{repo}-rawhide.repo
-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)
+Source21:       RPM-GPG-KEY-rpmfusion-%{repo}-fedora-21-primary
 BuildArch:      noarch
 
 Requires:       system-release >= %{version}
 
-# If apt is around, it needs to be a version with repomd support
-Conflicts:      apt < 0.5.15lorg3
 
 %if %{repo} == "nonfree"
 Requires:       rpmfusion-free-release >= %{version}
@@ -53,7 +50,6 @@
 echo "Nothing to build"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 # Create dirs
 install -d -m755 \
@@ -62,45 +58,38 @@
 
 # GPG Key
 %{__install} -Dp -m644 \
-    %{SOURCE18} \
     %{SOURCE19} \
     %{SOURCE20} \
+    %{SOURCE21} \
     $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
 
 # 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
+ln -s $(basename %{SOURCE21}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-21
 
 # 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} \
     $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %{_sysconfdir}/pki/rpm-gpg/*
 %config(noreplace) %{_sysconfdir}/yum.repos.d/*
 
 %changelog
+* Fri Jun 28 2013 Nicolas Chauvet <kwizart at gmail.com> - 20-0.2
+- Add key for Rawhide/F-21
+- Spec file clean-up
+
 * Mon Mar 18 2013 Nicolas Chauvet <kwizart at gmail.com> - 20-0.1
 - Build for Rawhide/F-20
 


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