Author: thl Update of /cvs/free/rpms/rpmfusion-free-release/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14599 Modified Files: rpmfusion-free-rawhide.repo rpmfusion-free-release.spec rpmfusion-free-updates-testing.repo rpmfusion-free-updates.repo rpmfusion-free.repo Removed Files: RPM-GPG-KEY-rpmfusion-free-fedora Log Message: * Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11-1 - F11 release: disable rawhide, enable everything and updates - use "metadata_expire=7d" for everything repos - Track in some changes from 10-{34} (myself): -- remove old comments to obsolete release packages from freshrpms, dribble and livna -- add proper links for rawhide -- add key for F12 -- some small adjustments to the spec -- add post script that switch old config files from serverside mirrorlists to mirrormanager - Track in some changes from 10-{23} (Till Maas): -- fix symlinks -- allow easy transition to F11 with new gpg key and naming structure - Index: rpmfusion-free-rawhide.repo =================================================================== RCS file: /cvs/free/rpms/rpmfusion-free-release/devel/rpmfusion-free-rawhide.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpmfusion-free-rawhide.repo 21 Mar 2009 17:31:43 -0000 1.6 +++ rpmfusion-free-rawhide.repo 17 May 2009 15:16:24 -0000 1.7 @@ -2,9 +2,9 @@ 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-rawhi... -enabled=1 +enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$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-rawhi... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$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-rawhi... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$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/devel/rpmfusion-free-release.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- rpmfusion-free-release.spec 29 Mar 2009 14:00:31 -0000 1.11 +++ rpmfusion-free-release.spec 17 May 2009 15:16:24 -0000 1.12 @@ -2,19 +2,19 @@ #define repo nonfree Name: rpmfusion-%{repo}-release -Version: 10.90 -Release: 3 +Version: 11 +Release: 1 Summary: RPM Fusion (%{repo}) Repository Configuration Group: System Environment/Base License: BSD URL: http://rpmfusion.org -Source0: RPM-GPG-KEY-rpmfusion-%{repo}-fedora Source1: rpmfusion-%{repo}.repo Source2: rpmfusion-%{repo}-updates.repo Source3: rpmfusion-%{repo}-updates-testing.repo Source4: rpmfusion-%{repo}-rawhide.repo -Source10: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-11-primary +Source11: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-11-primary +Source12: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-12-primary BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,16 +25,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 @@ -70,18 +60,34 @@ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d # GPG Key -%{__install} -Dp -m644 %{SOURCE0} %{SOURCE10} \ +%{__install} -Dp -m644 %{SOURCE11} %{SOURCE12} \ $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg +# compatibility symlink for easy transition to F11 +ln -s $(basename %{SOURCE11}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora + # 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-${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 + # Yum .repo files %{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d +%post +if grep 'mirrorlist=http://download1.rpmfusion.org/' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}.repo &> /dev/null ; then + sed -i 's!mirrorlist=http://download1.rpmfusion.org/%{repo}/fedora/.mirrorlist-%{repo}-fedora-releases$!mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=%{repo}-fedora-$releasever\&arch=$basearch!' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}.repo +fi +if grep 'mirrorlist=http://download1.rpmfusion.org/' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-updates.repo &> /dev/null ; then + sed -i 's!mirrorlist=http://download1.rpmfusion.org/%{repo}/fedora/.mirrorlist-%{repo}-fedora-updates$!mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=%{repo}-fedora-updates-released-$releasever\&arch=$basearch!' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-updates.repo +fi + + %clean rm -rf $RPM_BUILD_ROOT @@ -91,6 +97,35 @@ %config(noreplace) %{_sysconfdir}/yum.repos.d/* %changelog +* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11-1 +- F11 release: disable rawhide, enable everything and updates +- use "metadata_expire=7d" for everything repos +- Track in some changes from 10-{34} (myself): +-- remove old comments to obsolete release packages from freshrpms, dribble and livna +-- add proper links for rawhide +-- add key for F12 +-- some small adjustments to the spec +-- add post script that switch old config files from serverside mirrorlists to + mirrormanager +- Track in some changes from 10-{23} (Till Maas): +-- fix symlinks +-- allow easy transition to F11 with new gpg key and naming structure +- + +* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10-4 +- add key for F12 +- some small adjustments to the spec +- add post script that switch old config files from serverside mirrorlists to + mirrormanager + +* Sat May 16 2009 Till Maas <opensource(a)till.name&gt; - 10-3 +- fix symlinks + +* Sat May 16 2009 Till Maas <opensource(a)till.name&gt; - 10-2 +- allow easy transition to F11 with new gpg key and naming structure + + + * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.90-3 - rebuild for new F11 features @@ -122,10 +157,10 @@ - Update for Fedora 10 rawhide - enable devel repos, disable all the others -* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-7 +* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-7 - Use temporary mirrorlists for now, and baseurl for the debug & source repos -* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-6 +* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-6 - Fix rpmfusion-rpmfusion typo * Mon Aug 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-5 Index: rpmfusion-free-updates-testing.repo =================================================================== RCS file: /cvs/free/rpms/rpmfusion-free-release/devel/rpmfusion-free-updates-testing.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpmfusion-free-updates-testing.repo 21 Mar 2009 17:31:43 -0000 1.4 +++ rpmfusion-free-updates-testing.repo 17 May 2009 15:16:24 -0000 1.5 @@ -4,7 +4,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch [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-updat... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch [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-updat... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch Index: rpmfusion-free-updates.repo =================================================================== RCS file: /cvs/free/rpms/rpmfusion-free-release/devel/rpmfusion-free-updates.repo,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rpmfusion-free-updates.repo 21 Mar 2009 17:31:43 -0000 1.7 +++ rpmfusion-free-updates.repo 17 May 2009 15:16:24 -0000 1.8 @@ -2,9 +2,9 @@ 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-updat... -enabled=0 +enabled=1 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch [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-updat... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch [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-updat... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch Index: rpmfusion-free.repo =================================================================== RCS file: /cvs/free/rpms/rpmfusion-free-release/devel/rpmfusion-free.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpmfusion-free.repo 21 Mar 2009 17:31:43 -0000 1.6 +++ rpmfusion-free.repo 17 May 2009 15:16:24 -0000 1.7 @@ -2,23 +2,26 @@ 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-$rele... -enabled=0 +enabled=1 +metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch [rpmfusion-free-debuginfo] name=RPM Fusion for Fedora $releasever - Free - Debug #baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/debug/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-debug... enabled=0 +metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch [rpmfusion-free-source] name=RPM Fusion for Fedora $releasever - Free - Source #baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-sourc... enabled=0 +metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch --- RPM-GPG-KEY-rpmfusion-free-fedora DELETED ---