rpms/rpmfusion-free-release/F-19 RPM-GPG-KEY-rpmfusion-free-fedora-21-primary, NONE, 1.1 rpmfusion-free-release.spec, 1.38, 1.39 rpmfusion-free-updates-testing.repo, 1.11, 1.12 rpmfusion-free.repo, 1.20, 1.21 RPM-GPG-KEY-rpmfusion-free-fedora-18-primary, 1.1, NONE

Fri Jun 28 23:44:13 CEST 2013

Author: kwizart

Update of /cvs/free/rpms/rpmfusion-free-release/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6334/F-19

Modified Files:
	rpmfusion-free-release.spec 
	rpmfusion-free-updates-testing.repo rpmfusion-free.repo 
Added Files:
	RPM-GPG-KEY-rpmfusion-free-fedora-21-primary 
Removed Files:
	RPM-GPG-KEY-rpmfusion-free-fedora-18-primary 
Log Message:
Update to F-19 Final

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

mQINBFHN/E8BEADC4tpuU6vRz5FTDcbiZrhpWkhjtA3QIPGm9qlOt/woOisra6Gh
lriua9LzkLRnj5fTpbgciGjE5qM5Jy/YLZeHsqtHOt2DSWYoEcQbeRYJDO//aKtC
vw/rOH1s5rkfdtaIjcIjaVo3vW8nmoSfUMBP7p+uvzjo6OcOPhZlD9DOWgeZfo0N
J4mPuxMmi/uK5PirW1HC1XVHnpdS2a9wM4KzrddOA6aA6Gdu88VyG2pb3k41U2ox
8GA6mxJ06XwKNqKD15cyty5fG5mWIdRvMeP0nUShxTUw6lt6qH8MWr/Xj6BPiHcf
xNdLi9SsojRy4W38StWLKfYRtwLnGoylw2PX74wsMkBuliGpWM8nHLCb4Y2hhs5M
mzy4c8Nu8/pPCTcREu2zhS4mbHhzA8RAqaR5uBG6Uj2GKmU7BP0WviSCUTCNf30z
XJeGYWDk9GZJFiBAa/S9qLKUX5rRwvPaF2m8PM2Hwaafsm9cQQUu8I1uTkEkwZer
iRQJe0UPcjrxKsWrCtl1x3mcVLqtRlK8TWAyTM/W9uf90Q3bTnfJqN8QVdPQNz/M
bR4dNLuVQWr0PvwzmOEn/yWVBqv9tFJHXsbQXr98lupZL+kPz53DW/9VIYIk0kFM
Aj75XtbX+mm0PmA+Te3DnMWC3QqLDXZIx/nHzjdYLTGCOUPJpFAHKHvKmwARAQAB
tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMSkgPHJw
bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIAIgUC
Uc38TwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQPIN9DWRG2FkaaQ/7
BxsoRJKz4nIgjgi5L0qXmY0DNl2A+dk5PDE8bYOvLMB48EE9FhFbtRt8xbbE3iHT
IUcWT4ABJtktqeuzJ3UcAkac6asy+260oQOj8ripM8myZLZGMGmMExj2i02RDxq1
OtT68FH4yvacTPKbSgN6D6xSpKHlQL5yurQQBQLZ2i/+MdyM6btG6Ebv/2nHapQJ
PvC+AIwgvUFt8iFf4p4HfkQ94ZtZopdDGAMFazwGGpp+sCFpCondsunMLjbEMn51
WHJNv82jmoop2NBoWWQVdTsAZumRSpjB7jxev8S7vk30iii8oivewVNwDbz9pHAv
5HdRBFB203w+aA8TqGj9WfMyWyrxWABSYEJhVUGNVKcy0XqWO+iB9ufGN6zsXXoo
AHYw6oC1EJVEgU0DBIMmPeSDmUmhRlalcgQYSnLC00lMETfaO5w4lLi7PS5xkTzK
gELzCmoWPBoqD2trfGx4lFRjzLZttKPdW0dFvqpd/E2cRdclz/WHyi718F6iyHOf
MG2T+mMz5nURokQX5onfB+IX82ADZXSntD/1qsDno4EO2BDItpnV3rrXz3Lnnfyi
ac20V6CeKenFNo2aBu2aS8A46rxpdrg8H0ZglwO7GQ0NpJe2Vrbl1vB224WbnABx
x9PKNaZo0RGgx0WqZtEv6Wk68cpnZ+HvClWoaT7P4BA=
=OMMM
-----END PGP PUBLIC KEY BLOCK-----


Index: rpmfusion-free-release.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-19/rpmfusion-free-release.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- rpmfusion-free-release.spec	14 Mar 2013 23:37:24 -0000	1.38
+++ rpmfusion-free-release.spec	28 Jun 2013 21:44:13 -0000	1.39
@@ -3,7 +3,7 @@
 
 Name:           rpmfusion-%{repo}-release
 Version:        19
-Release:        0.4
+Release:        1
 Summary:        RPM Fusion (%{repo}) Repository Configuration
 
 Group:          System Environment/Base
@@ -13,17 +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 +49,6 @@
 echo "Nothing to build"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 # Create dirs
 install -d -m755 \
@@ -62,18 +57,18 @@
 
 # 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
+ln -s $(basename %{SOURCE19}) $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
@@ -82,7 +77,6 @@
 # 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
 
@@ -92,15 +86,15 @@
     $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> - 19-1
+- Add key for Rawhide/F-21
+- Spec file clean-up
+
 * Thu Mar 14 2013 Nicolas Chauvet <kwizart at gmail.com> - 19-0.4
 - Fix GPG's key name
 


Index: rpmfusion-free-updates-testing.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-19/rpmfusion-free-updates-testing.repo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpmfusion-free-updates-testing.repo	13 Mar 2013 20:10:03 -0000	1.11
+++ rpmfusion-free-updates-testing.repo	28 Jun 2013 21:44:13 -0000	1.12
@@ -2,7 +2,7 @@
 name=RPM Fusion for Fedora $releasever - Free - Test Updates
 #baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-testing-$releasever&arch=$basearch
-enabled=1
+enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 


Index: rpmfusion-free.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-19/rpmfusion-free.repo,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rpmfusion-free.repo	13 Mar 2013 20:10:03 -0000	1.20
+++ rpmfusion-free.repo	28 Jun 2013 21:44:13 -0000	1.21
@@ -3,7 +3,7 @@
 #baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-$releasever&arch=$basearch
 enabled=1
-#metadata_expire=7d
+metadata_expire=7d
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 


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