rpms/rpmfusion-free-release/devel rpmfusion-free-rawhide.repo, 1.22, 1.23 rpmfusion-free-release.spec, 1.37, 1.38 rpmfusion-free-updates-testing.repo, 1.11, 1.12 rpmfusion-free-updates.repo, 1.19, 1.20 rpmfusion-free.repo, 1.20, 1.21

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	rpmfusion-free-rawhide.repo rpmfusion-free-release.spec 
	rpmfusion-free-updates-testing.repo 
	rpmfusion-free-updates.repo rpmfusion-free.repo 
Log Message:
Build for F-20



Index: rpmfusion-free-rawhide.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/devel/rpmfusion-free-rawhide.repo,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rpmfusion-free-rawhide.repo	13 Mar 2013 20:10:02 -0000	1.22
+++ rpmfusion-free-rawhide.repo	18 Mar 2013 22:38:28 -0000	1.23
@@ -2,7 +2,7 @@
 name=RPM Fusion for Fedora Rawhide - Free
 #baseurl=http://download1.rpmfusion.org/free/fedora/development/$basearch/os/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhide&arch=$basearch
-enabled=0
+enabled=1
 gpgcheck=1
 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/devel/rpmfusion-free-release.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- rpmfusion-free-release.spec	13 Mar 2013 20:10:02 -0000	1.37
+++ rpmfusion-free-release.spec	18 Mar 2013 22:38:28 -0000	1.38
@@ -2,8 +2,8 @@
 #define repo nonfree
 
 Name:           rpmfusion-%{repo}-release
-Version:        19
-Release:        0.3
+Version:        20
+Release:        0.1
 Summary:        RPM Fusion (%{repo}) Repository Configuration
 
 Group:          System Environment/Base
@@ -70,10 +70,22 @@
 # 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
+
 # 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} \
@@ -89,6 +101,12 @@
 %config(noreplace) %{_sysconfdir}/yum.repos.d/*
 
 %changelog
+* Mon Mar 18 2013 Nicolas Chauvet <kwizart at gmail.com> - 20-0.1
+- Build for Rawhide/F-20
+
+* Thu Mar 14 2013 Nicolas Chauvet <kwizart at gmail.com> - 19-0.4
+- Fix GPG's key name
+
 * Wed Mar 13 2013 Nicolas Chauvet <kwizart at gmail.com> - 19-0.3
 - Branch F-19
 


Index: rpmfusion-free-updates-testing.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/devel/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	18 Mar 2013 22:38:28 -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-updates.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/devel/rpmfusion-free-updates.repo,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpmfusion-free-updates.repo	13 Mar 2013 20:10:03 -0000	1.19
+++ rpmfusion-free-updates.repo	18 Mar 2013 22:38:28 -0000	1.20
@@ -2,7 +2,7 @@
 name=RPM Fusion for Fedora $releasever - Free - Updates
 #baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
 mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updates-released-$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/devel/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	18 Mar 2013 22:38:28 -0000	1.21
@@ -2,7 +2,7 @@
 name=RPM Fusion for Fedora $releasever - Free
 #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
+enabled=0
 #metadata_expire=7d
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever