Author: thl Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14755 Modified Files: rpmfusion-nonfree-rawhide.repo rpmfusion-nonfree-release.spec rpmfusion-nonfree-updates-testing.repo rpmfusion-nonfree-updates.repo rpmfusion-nonfree.repo Added Files: RPM-GPG-KEY-rpmfusion-nonfree-fedora-12-primary Removed Files: RPM-GPG-KEY-rpmfusion-nonfree-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 - --- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-fedora-12-primary --- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.5 (GNU/Linux) mQINBEoQCe8BEAC+28wu7rGOYZeknFTSFyBMYC2EHQ13Arx2+izUWP0/zIIPrXVg /ipAfCDpNnZgPGIxE7Z/aT2joLos0FOaB0eRxNn1CsRipnK+FX8no7CTIdLJh6Fj +0YZYo3HZ07x8ulS0JtmyD3iLHHw/QFLzVNY0U/Bmdqyefyv3EJhAWnV/IQSyKPl QmuS80n1uoHBqcWzfVP3FV5AN/10pvneyypcjjjbDRfWSiVYt7VDsGVSPvecG83b z05Hq9wNurWQPo7cxxGqMUP68pY78rUSlv88rZgJOsGgxsTNAXefQBVwRR8h6VkS 0U3+8n1pS1e6UVpzWx6GFrvxYwgxa1lZq3rhLL4X73CLhu2oTWsOyIntwIQtO775 OVz6M+hWqni3Dub48PDbp9mbRnrYIvI7yfYYHi2ibSADNtu4vXfyHg84+wFRgBEp /TddMu1QfijZNRQIVgkpE+NBCiQ7Ye86FSF3doyBqa3DrhMsJlh3cTk/E+ivikrT lKIDJDGPl5pIqGqVWZ5dlO4++FUZfe17bki2bEBCfY0kb6eAQ9r7vhNnXN4dTmdX 81nO5GFzatSBDY8oUNBQhKuEBd+hj/4wQYNdBqQbwe99bcuzYy4lQlw4XOAGi8o6 81eStZ76kxjv76BL/bvxvXeDDg7OPezL+Ihx7zKqdL6jiDGlZghixWYgfQARAQAB tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxMikg PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCNgQTAQIA IAUCShAJ7wIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEIkw412jqILBZZ0P /ial9trjQKXwVlaDjVMx1tkz/D9+tsRQTDNNgCTsCTgGbFERhdgNuoxAAkbKBVqN o/e7hT3sKxhv83kGhUwpckSiXbNzvoaCeiHa+o2VBUBN7PsUhOiaDBQiH3WThpaJ Ebq+/gQQv6c19NZjylqb8MXyyNjye+K+cNbXjakDGPOrmWRNNQ9cDP6IawFaU4gy fi0YKO/kWVTu9Qh3PHF63jsYs1nNUq+6mAvsdYiyLhXKPk0lVGHak7JsAJcqrLCK pApUZpsGwGAuv0pMAGKT7nsd9KCoRBgN3vv+HI5R8XcvxLAEt254XkYqkwbki2aB Y9Kn4y6pXPXs+la7VGOzgpDiH2TgWqhsQPOPMltKYlE0wl2spI3r1QnNpW27LJBb aeRcSzNficIOCtCxyTOyATJoHA0zkkg+sBz+qBC1RsY4uiH5FMeUvi/D4M32WObc ZFUvRg3w9SHKh0+1fb7OvIyMXTQP+jIUAtyP0zSmHjQGgeQc5ZOK6m3NNoCrgZao BJPWE/F03STaiauGnhMVpm7rT8Wmn5tW2NQUnqjY9eIuoWm7FQK6shYCt0q0rHJj YYaCvMGoHKyyT/itgPhvITFMqJ+DO5Z5ZIalV6bSMYawxgN9BhUn9VG8uxBuTBuq WlEGO6RBOB1zS/Q+7zBLOIOcfnD09UMHJGDRSSgAT2Ue =r+Kf -----END PGP PUBLIC KEY BLOCK----- Index: rpmfusion-nonfree-rawhide.repo =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-rawhide.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpmfusion-nonfree-rawhide.repo 21 Mar 2009 17:35:36 -0000 1.6 +++ rpmfusion-nonfree-rawhide.repo 17 May 2009 15:20:09 -0000 1.7 @@ -2,9 +2,9 @@ name=RPM Fusion for Fedora Rawhide - Nonfree #baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basearch/os/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-ra... -enabled=1 +enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide-$basearch [rpmfusion-nonfree-rawhide-debuginfo] name=RPM Fusion for Fedora Rawhide - Nonfree - Debug @@ -12,7 +12,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-ra... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide-$basearch [rpmfusion-nonfree-rawhide-source] name=RPM Fusion for Fedora Rawhide - Nonfree - Source @@ -20,5 +20,5 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-ra... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-latest-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-rawhide-$basearch Index: rpmfusion-nonfree-release.spec =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-release.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rpmfusion-nonfree-release.spec 29 Mar 2009 15:11:24 -0000 1.10 +++ rpmfusion-nonfree-release.spec 17 May 2009 15:20:09 -0000 1.11 @@ -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,17 +60,32 @@ $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 @@ -88,9 +93,38 @@ %files %defattr(-,root,root,-) %{_sysconfdir}/pki/rpm-gpg/* -%config(noreplace) %{_sysconfdir}/yum.repos.d/* +%config %{_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 @@ -121,7 +155,7 @@ - Update for Fedora 10 rawhide - enable devel repos, disable all the others -* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-6 +* Sat Sep 27 2008 Stewart Adam <s.adam at diffingo.com> - 9-6 - Use temporary mirrorlists for now, and baseurl for the debug & source repos * Mon Aug 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-5 Index: rpmfusion-nonfree-updates-testing.repo =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-updates-testing.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpmfusion-nonfree-updates-testing.repo 21 Mar 2009 17:35:36 -0000 1.4 +++ rpmfusion-nonfree-updates-testing.repo 17 May 2009 15:20:09 -0000 1.5 @@ -4,7 +4,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch [rpmfusion-nonfree-updates-testing-debuginfo] name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Debug @@ -12,7 +12,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch [rpmfusion-nonfree-updates-testing-source] name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Source @@ -20,5 +20,5 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch Index: rpmfusion-nonfree-updates.repo =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-updates.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpmfusion-nonfree-updates.repo 21 Mar 2009 17:35:36 -0000 1.6 +++ rpmfusion-nonfree-updates.repo 17 May 2009 15:20:09 -0000 1.7 @@ -2,9 +2,9 @@ name=RPM Fusion for Fedora $releasever - Nonfree - Updates #baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... -enabled=0 +enabled=1 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch [rpmfusion-nonfree-updates-debuginfo] name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug @@ -12,7 +12,7 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch [rpmfusion-nonfree-updates-source] name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source @@ -20,5 +20,5 @@ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up... enabled=0 gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch Index: rpmfusion-nonfree.repo =================================================================== RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpmfusion-nonfree.repo 21 Mar 2009 17:35:36 -0000 1.6 +++ rpmfusion-nonfree.repo 17 May 2009 15:20:09 -0000 1.7 @@ -2,23 +2,26 @@ name=RPM Fusion for Fedora $releasever - Nonfree #baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$r... -enabled=0 +enabled=1 +metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch [rpmfusion-nonfree-debuginfo] name=RPM Fusion for Fedora $releasever - Nonfree - Debug #baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-de... enabled=0 +metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch [rpmfusion-nonfree-source] name=RPM Fusion for Fedora $releasever - Nonfree - Source #baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/ mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-so... enabled=0 +metadata_expire=7d gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch --- RPM-GPG-KEY-rpmfusion-nonfree-fedora DELETED ---