rpms/rpmfusion-free-release/F-10 rpmfusion-free-rawhide.repo, 1.5, 1.6 rpmfusion-free-release.spec, 1.8, 1.9

[Thorsten Leemhuis]

Author: thl

Update of /cvs/free/rpms/rpmfusion-free-release/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11477

Modified Files:
	rpmfusion-free-rawhide.repo rpmfusion-free-release.spec 
Log Message:
* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10-5
- remove old comments to obsolete release packages from freshrpms, dribble and livna
- add proper links for rawhide 



Index: rpmfusion-free-rawhide.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-10/rpmfusion-free-rawhide.repo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmfusion-free-rawhide.repo	17 May 2009 14:01:09 -0000	1.5
+++ rpmfusion-free-rawhide.repo	17 May 2009 14:33:43 -0000	1.6
@@ -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-$releasever-$basearch
+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
 
 [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-$releasever-$basearch
+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
 
 [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-$releasever-$basearch
+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
 


Index: rpmfusion-free-release.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-10/rpmfusion-free-release.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpmfusion-free-release.spec	17 May 2009 14:01:09 -0000	1.8
+++ rpmfusion-free-release.spec	17 May 2009 14:33:43 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:           rpmfusion-%{repo}-release
 Version:        10
-Release:        4
+Release:        5
 Summary:        RPM Fusion (%{repo}) Repository Configuration
 
 Group:          System Environment/Base
@@ -26,16 +26,6 @@
 
 %if %{repo} == "nonfree"
 Requires:       rpmfusion-free-release >= %{version}
-# enable those once RPM Fusion is in full production and ready
-# to obsolete the old repos:
-#Provides:   freshrpms-release = %{version}-%{release}
-#Obsoletes:  freshrpms-release <= %{version}-%{release}
-
-#Provides:   livna-release  = %{version}-%{release}
-#Obsoletes:  livna-release <= %{version}-%{release}
-
-#Provides:   dribble-release  = %{version}-%{release}
-#Obsoletes:  dribble-release <= %{version}-%{release}
 
 %description
 RPM Fusion repository contains open source and other distributable software for
@@ -79,9 +69,11 @@
 
 # Links for the keys
 for i in i386 x86_64 ppc ppc64; do
-	  ln -s $(basename %{SOURCE10}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-10-${i}
+  ln -s $(basename %{SOURCE10}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-10-${i}
   ln -s $(basename %{SOURCE11}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-11-${i}
   ln -s $(basename %{SOURCE12}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-12-${i}
+  ln -s $(basename %{SOURCE11}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest-${i}
+  ln -s $(basename %{SOURCE12}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-rawhide-${i}
 done
 
 
@@ -107,6 +99,10 @@
 %config(noreplace) %{_sysconfdir}/yum.repos.d/*
 
 %changelog
+* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10-5
+- remove old comments to obsolete release packages from freshrpms, dribble and livna
+- add proper links for rawhide 
+
 * Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10-4
 - add key for F12
 - some small adjustments to the spec