rpms/rpmfusion-free-release/F-18 RPM-GPG-KEY-rpmfusion-free-fedora-20-primary, NONE, 1.1 rpmfusion-free-rawhide.repo, 1.19, 1.20 rpmfusion-free-release.spec, 1.37, 1.38 rpmfusion-free-updates-testing.repo, 1.9, 1.10 rpmfusion-free-updates.repo, 1.18, 1.19 rpmfusion-free.repo, 1.19, 1.20 RPM-GPG-KEY-rpmfusion-free-fedora-17-primary, 1.1, NONE

Nicolas Chauvet kwizart at rpmfusion.org
Tue Jan 1 20:26:35 CET 2013


Author: kwizart

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

Modified Files:
	rpmfusion-free-rawhide.repo rpmfusion-free-release.spec 
	rpmfusion-free-updates-testing.repo 
	rpmfusion-free-updates.repo rpmfusion-free.repo 
Added Files:
	RPM-GPG-KEY-rpmfusion-free-fedora-20-primary 
Removed Files:
	RPM-GPG-KEY-rpmfusion-free-fedora-17-primary 
Log Message:
Add release 18



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

mQINBFDjFIMBEACxi7RjaVkeqIIPBmCFUuVLBXNYBw9BY3tAZRfYx++kgU40aApo
ikvpGN80lTzXrt4NlnTVMebAREgUerNyT8Or7ZDXGPv5p3Mhi43bG5N1pm1fq3Hu
xgr6OE6JZN6rNU+qkyynaWv0kHBRHKA0QuzrmRzYPmwIip5rY2LjQ9wHeENm6Wo6
Ykti2VN7Ij2tH1kEPDAuHF9EpPmqlfESrqNrSGbkJUifGlFDzhAZ983apy0kWoju
lGHHUEtZtCDvn5KvroI4j8oZ1JDbNRNAYMbMAf4FL0wjQGvY+0abKHVSIahZIaQe
A51VrQ/anUFCC3TppR6ujrOKCoM7nTPmePSBWGJ/amtLT7+MC01knOwBbtI8gBl6
3F4EU6VX62BG7HgrJgTR0PU7Qo79rkCybuFRv6tHv3DZtCa0LXvxmKK6xTfWAF1T
klPaVKUh4qI8IeG5iqfmePxvaIkQt7Jp2K9/We/FXElzwJsRfpStfYBgAWvXSTRJ
Fohy2OHVC33eInPB1y/uUlmZ24vSisNdMK5et5KKO1Xa0Gm+sS+cJyj+ChFGBfLx
sZbAitf8suvJTs6ZHOKY6yc0xg4AU7fthMwcZYLGM+IlTTyS+BAp3I2ipSSS3TT3
hkHvZONSJ7doAauYJy+DjkhFxp4rObWh5CVfUNcaDxRA4piPql8qG++JPwARAQAB
tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgyMCkgPHJw
bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCOAQTAQIAIgUC
UOMUgwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQljqISK5ogiN+SRAA
iUQ07hzO+dWdOUI/rSSE3ZKNePSQKl72/7aFeceuJKcTv9RuLb3PjbYqt8xDl3xJ
sVXLoEqWPkEiXv16Y8mESxMsEAqe5JrvS/LjZ2GCZGr3nCvOi39n73tcgfL7CZn2
ShnetMG7xQlbhgPQbevrxn+4p5j8rwFc/d8BITjBZUS8nozNgNgElwGPj52pEhyG
yfha+VjfNXEAHLuAWUZJDQqIyJ9EJ2glU4VgUD/HH91dFq6AL6+vd6hj8iIpChiS
dl5xLlJ3qqKExYwUbDdO8Zr7FPMw2n5ClE8X/0tO2YdcKHQdjqjzfqXIVkK/4+Hr
dQ1grSCYq/O7MZwTJCqgbwwL7SbJWmAQVGH9trjzVZ1uTcSX/IaciGShaOzWucfM
TYVYD0p9n/KSiwvWJySTIVxWAef9FegmgGgZ+FpwN8btRHrD/wN057W8lQ7ZD4U4
5TkgQZSVj7u4kjzWq0/sb9dyURPZILMsfqDtvbLzAO88/WQz9Y2p59sXQumZOno3
0ZNYTgDzag7ot51iYnPMNXlGfKYz2/h14RxIPo0hzZ3b8ckWOUOlbtGLw+JVGUlz
B9iPme5TgNuX6umU12992kN6lJ4Es6o+a3DDlk3Q5/bU8Yq+vP/l7AQz1JYbCVLw
e6LYuhJ0mGfGyE8zUxJdnmAoZZyhZG1naFDLCu0b5l8=
=Ceg5
-----END PGP PUBLIC KEY BLOCK-----


Index: rpmfusion-free-rawhide.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-18/rpmfusion-free-rawhide.repo,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpmfusion-free-rawhide.repo	8 Aug 2012 16:30:51 -0000	1.19
+++ rpmfusion-free-rawhide.repo	1 Jan 2013 19:26:34 -0000	1.20
@@ -4,7 +4,7 @@
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhide&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-latest-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-rawhide-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-latest file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-rawhide
 
 [rpmfusion-free-rawhide-debuginfo]
 name=RPM Fusion for Fedora Rawhide - Free - Debug
@@ -12,7 +12,7 @@
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhide-debug&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-latest-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-rawhide-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-latest file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-rawhide
 
 [rpmfusion-free-rawhide-source]
 name=RPM Fusion for Fedora Rawhide - Free - Source
@@ -20,5 +20,5 @@
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhide-source&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-latest-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-rawhide-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-latest file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-rawhide
 


Index: rpmfusion-free-release.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-18/rpmfusion-free-release.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rpmfusion-free-release.spec	22 Dec 2012 06:12:38 -0000	1.37
+++ rpmfusion-free-release.spec	1 Jan 2013 19:26:34 -0000	1.38
@@ -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 at gmail.com> - 18-1
+- Update to final 18
+- Remove basearch from the gpg key
+
 * Sat Dec 22 2012 Nicolas Chauvet <kwizart at gmail.com> - 18-0.5
 - Disable updates-testing
 - Add symlinks for secondary


Index: rpmfusion-free-updates-testing.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-18/rpmfusion-free-updates-testing.repo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmfusion-free-updates-testing.repo	22 Dec 2012 06:12:38 -0000	1.9
+++ rpmfusion-free-updates-testing.repo	1 Jan 2013 19:26:34 -0000	1.10
@@ -4,7 +4,7 @@
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-testing-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-updates-testing-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free - Test Updates Debug
@@ -12,7 +12,7 @@
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-testing-debug-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-updates-testing-source]
 name=RPM Fusion for Fedora $releasever - Free - Test Updates Source
@@ -20,5 +20,5 @@
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-testing-source-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 


Index: rpmfusion-free-updates.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-18/rpmfusion-free-updates.repo,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpmfusion-free-updates.repo	21 Sep 2012 09:43:02 -0000	1.18
+++ rpmfusion-free-updates.repo	1 Jan 2013 19:26:34 -0000	1.19
@@ -4,7 +4,7 @@
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-$releasever&arch=$basearch
 enabled=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-updates-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free - Updates Debug
@@ -12,7 +12,7 @@
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-updates-source]
 name=RPM Fusion for Fedora $releasever - Free - Updates Source
@@ -20,5 +20,5 @@
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
+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-18/rpmfusion-free.repo,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpmfusion-free.repo	17 Sep 2012 21:12:25 -0000	1.19
+++ rpmfusion-free.repo	1 Jan 2013 19:26:34 -0000	1.20
@@ -3,9 +3,9 @@
 #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-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free - Debug
@@ -14,7 +14,7 @@
 enabled=0
 metadata_expire=7d
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-source]
 name=RPM Fusion for Fedora $releasever - Free - Source
@@ -23,5 +23,5 @@
 enabled=0
 metadata_expire=7d
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 


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


More information about the rpmfusion-commits mailing list