rpms/xine/F-9 dead.package,NONE,1.1
by Xavier Lamien
Author: laxathom
Update of /cvs/free/rpms/xine/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25596/F-9
Added Files:
dead.package
Log Message:
set xine as dead package.
--- NEW FILE dead.package ---
This package has been imported into FPC now as xine-ui.
15 years, 6 months
rpms/xine/F-8 dead.package,NONE,1.1
by Xavier Lamien
Author: laxathom
Update of /cvs/free/rpms/xine/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25596/F-8
Added Files:
dead.package
Log Message:
set xine as dead package.
--- NEW FILE dead.package ---
This package has been imported into FPC now as xine-ui.
15 years, 6 months
rpms/xine/F-10 dead.package,NONE,1.1
by Xavier Lamien
Author: laxathom
Update of /cvs/free/rpms/xine/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25596/F-10
Added Files:
dead.package
Log Message:
set xine as dead package.
--- NEW FILE dead.package ---
This package has been imported into FPC now as xine-ui.
15 years, 6 months
rpms/rpmfusion-free-release/devel RPM-GPG-KEY-rpmfusion-free-fedora-12-primary, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rpmfusion-free-release/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15178
Added Files:
RPM-GPG-KEY-rpmfusion-free-fedora-12-primary
Log Message:
add file
--- NEW FILE RPM-GPG-KEY-rpmfusion-free-fedora-12-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
mQINBEoQCVkBEAC/C3Kbm1MJJ4A7e5T3HKFRFI0S5+jpKKtgohN9NzAJq2Q0/66M
CtQs2t0LBjVTiP3YMzvj33GFNuR/vYwLLYUSG/tJufEb4lNGaOopwgZziOyuqKOi
OeNmX8T2UwsU8IgkXcoYn/cgKk5I8B07n3F+Bunyl1GocGr8UXovH4sKRk3FdNi7
r+U6eIr9mMlOLVkvp/oF7rrheL3FJ86a/wkmouOjWVMHIiT2jLBaNs0vMN58o4qz
DUMTqWSHwSbXPGdrKHeHitvOQGeRc9AYopxPGhL1S/LolqZbK84tWdDvIPrQDYVk
35dKebrbQYuIcQEcU6nXr61U4UsgWi2366JmGbhYAkUNTm+B/maVbVvdAvkn86Lv
Ul5AlAVaMNjrPCh5um0nlz2vg2KwbRhLrwfIZYXvN8x+XLA8S+fgw61pkE63RvqE
oAB4zp8/1QAOsBwhYvDISPTlDsvR03C5JjNlMCVfoRXmwEeRoEzoKnhXhWNZGdAo
z1xR1gObkEX1i3/zk7OkJX4XJyvKsR3z4gZ+LTY+oE7ahSRBDNnsE0omcCuqV8XR
QjpZ1gUhSJImjfXI2GdDslJsSwAbIPq9uz10XMlIgu4nbbFif0PN8gwmYW7Tm6O6
iuZiU53S5QVGRVaQEbM93Nq+nMYZ3ZKYBaNGMSUrKWXtzyydU8fLte4qCQARAQAB
tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxMikgPHJw
bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCNgQTAQIAIAUC
ShAJWQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJENVW/hMWyhpWQ5gP+wVo
jZ/srZtzjKwPu5xTzSfcFFvHWRW3mp6jogRC5qzw7ZcQ0v4FQCRvF4AZfDpjDr8B
f2PKreCELTzQ0P4ZQs1qdVsrEDJYuDh380lrmS9U0vgXw7JvBI/61NopoThQ5TKf
9ldCxEkQsPd4NFlR/6m6TxoO9POPH1kXHn10kkD0IrXMKDTg3OMrnf/FTvAhqjNB
j9HuQgnae3y//We+J7zi+xvLo24aig7VZ3CDvQ8lGchHFBkgxxNulb8xN3HzOWGj
KE+wwFDEiAL5D7mP7WG0baXsOhHfTuxXf1gvYfZ0U6nWSY5j0FH8MHt7mMK76qOc
MMBwqyVJuv2TZfaZMEuwwHMWcDw5kAMS2h1llcqrb8ANKG7vfhrcyuE7yHDnMhCf
ueszjwZoRGPJb6HUxgTnEWx7GcVqpOWhOVJoCyuglTfK1WUzYslLjqbOFcILhJKm
PRR1Matku0ab/Z1uuWmX0tLsS9H35UImFSbkB3RhQhFFNSj1U975j4chJLmQeWdW
Z5tMFB7/arD+jSVSzZITbzBLHHhSloILU7eL2X9HaY87kTSVTYMGMiRFTydwBLmE
0qY2W5m4xhF5RLoH9EtS82gu+5/AkSwgJfDR7G/3Zl250IbUakE+niovb8Cj1IFD
CZ4sRKbFMuJgbBG3IEq1gABoE1JNHcYZR3Q9tWMK
=+MTe
-----END PGP PUBLIC KEY BLOCK-----
15 years, 6 months
rpms/rpmfusion-nonfree-release/devel RPM-GPG-KEY-rpmfusion-nonfree-fedora-12-primary, NONE, 1.1 rpmfusion-nonfree-rawhide.repo, 1.6, 1.7 rpmfusion-nonfree-release.spec, 1.10, 1.11 rpmfusion-nonfree-updates-testing.repo, 1.4, 1.5 rpmfusion-nonfree-updates.repo, 1.6, 1.7 rpmfusion-nonfree.repo, 1.6, 1.7 RPM-GPG-KEY-rpmfusion-nonfree-fedora, 1.1, NONE
by Thorsten Leemhuis
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-%{...!' %{_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-%{...!' %{_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> - 10-3
+- fix symlinks
+
+* Sat May 16 2009 Till Maas <opensource(a)till.name> - 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 ---
15 years, 6 months
rpms/rpmfusion-free-release/devel rpmfusion-free-rawhide.repo, 1.6, 1.7 rpmfusion-free-release.spec, 1.11, 1.12 rpmfusion-free-updates-testing.repo, 1.4, 1.5 rpmfusion-free-updates.repo, 1.7, 1.8 rpmfusion-free.repo, 1.6, 1.7 RPM-GPG-KEY-rpmfusion-free-fedora, 1.1, NONE
by Thorsten Leemhuis
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-%{...!' %{_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-%{...!' %{_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> - 10-3
+- fix symlinks
+
+* Sat May 16 2009 Till Maas <opensource(a)till.name> - 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 ---
15 years, 6 months
rpms/rpmfusion-nonfree-release/F-10 rpmfusion-nonfree-release.spec, 1.8, 1.9
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14169
Modified Files:
rpmfusion-nonfree-release.spec
Log Message:
fix typo
Index: rpmfusion-nonfree-release.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-10/rpmfusion-nonfree-release.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpmfusion-nonfree-release.spec 17 May 2009 14:35:01 -0000 1.8
+++ rpmfusion-nonfree-release.spec 17 May 2009 15:11:09 -0000 1.9
@@ -65,7 +65,7 @@
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE10}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+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
15 years, 6 months
rpms/rpmfusion-free-release/F-10 rpmfusion-free-release.spec, 1.9, 1.10
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rpmfusion-free-release/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13767
Modified Files:
rpmfusion-free-release.spec
Log Message:
fix typo
Index: rpmfusion-free-release.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-10/rpmfusion-free-release.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmfusion-free-release.spec 17 May 2009 14:33:43 -0000 1.9
+++ rpmfusion-free-release.spec 17 May 2009 15:10:28 -0000 1.10
@@ -65,7 +65,7 @@
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE10}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+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
15 years, 6 months
rpms/rpmfusion-nonfree-release/F-10 RPM-GPG-KEY-rpmfusion-nonfree-fedora-10-primary, NONE, 1.1 RPM-GPG-KEY-rpmfusion-nonfree-fedora-11-primary, NONE, 1.1 RPM-GPG-KEY-rpmfusion-nonfree-fedora-12-primary, NONE, 1.1 rpmfusion-nonfree-rawhide.repo, 1.4, 1.5 rpmfusion-nonfree-release.spec, 1.7, 1.8 rpmfusion-nonfree-updates-testing.repo, 1.3, 1.4 rpmfusion-nonfree-updates.repo, 1.4, 1.5 rpmfusion-nonfree.repo, 1.4, 1.5 RPM-GPG-KEY-rpmfusion-nonfree-fedora, 1.1, NONE
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11627
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-10-primary
RPM-GPG-KEY-rpmfusion-nonfree-fedora-11-primary
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> - 10-5
- remove old comments to obsolete release packages from freshrpms, dribble and livna
- add proper links for rawhide
--- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-fedora-10-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
mQGiBEh43oURBACjM0AB3YpQ9MLjCASiZg+/GPCiqI+iKpLmmynFmT+THbqqCxLu
oV7AcDKnaoZnrwNoVOj5ZG6ITFO2hQ+D4KPsbAXZLfhZv/5tiXqEV8XUbHlEIVpw
iuLBGX8JK/gPZGsoBQgOUKn2FFiSJCCa8uBRbX9ihccdEEuYvC2NWcsXIwCghH1A
7+ltEEI9MoLNFNio25Sqs6kD/ii/fG02JFPi8JDN8R2BWHcbCd59FDDIdXvbHXld
m9SngJaIYZ5cECx5iOPlqmZTrJyqmoG0RzQRGA7kj/7yTal4LIqsfaLRLMDI+EVa
cxA9zdnBEAQgwZmQ0QRsBDEBD2zKhMvHMMro00/8i01qfalfwLlCj7r58dOdB/wc
n6B4A/9cIpcV1zipJrOTgEA4t48ehDMPOH58v5DP8ZCtpdzJm9hKGa3HwDSZt+A4
HgdBKUODyBi5LqNDEySz9DdJn4+k9iro6rEgapWc/6IjuJrLlCPYAEOa17ka3kA9
0rRMeOUEdTqNSJpuOp8rGXCPCKZ5pGYdujx7QWXIPHAVLHxxiLRRUlBNIEZ1c2lv
biByZXBvc2l0b3J5IChGZWRvcmEgLSBub25mcmVlKSA8cnBtZnVzaW9uLWJ1aWxk
c3lzQGxpc3RzLnJwbWZ1c2lvbi5vcmc+iGAEExECACAFAkh43oUCGwMGCwkIBwMC
BBUCCAMEFgIDAQIeAQIXgAAKCRAgb4GCsZgbaLXxAJoDQKjEweJjPsqRK6+ezh9h
tFh79gCfSLKkR/B4184aB7/LLCJZz7ilJ+O5Ag0ESHjemRAIANlJHiAsjpIBD1FD
NYZCtXnfh4Z5A4jZAN9Gp5pcguIUhIl0IdzOKRRtLezEMP8F6yB7CuQBCDUgl3bE
gJK1/MXBJTSCz/BYYzhSx3tE852gzQwN/gAbn/1/fW+L/cXCYPVcRluNYSg2I6AB
qLm2egNzd8FF+ars/dTLBb0SUODhW4IftCBYVA45sdewN5/HLVP7rHivqFZcOJoA
Epuyx23ZP47Vv5wEX+SrgsFERu7j0zv9QFaFNue/MsgEJ8ef4K8bWzQgleVCpegh
gpniSE9sToV/e1dCVewdQsmup/NCLSsTmB880LUoUMYJBQIrChRur2Tiu6Po8E8K
0MLToVsAAwYIAL/DcDGeepvhSyLuDsu875L7otoWwxRk2Y09/aME9KUB/h7vaWcv
YWdCdBtlzq7g7Fv9QK+s4B63ozM3HoMwQvtObQvksdD3vPbOaHymjE6Fqt+0+Qbd
OvJsxKK4Y62nDD9dRW2/1kdeURgl9VH0eWKEcUWNg1NPHUkZ2Mdh7DEzGCEvDDx7
aevKQYDXrYdTOcaByijXqswRZbJepZ32CUxQPYrZ0dwA4gjXs8UXDuLSnXNM/rUN
o1dAbSsgsOYCaqr1Z1nPF8RbTg6yA4gFqI/IGrgwVVe6DCTz2Shn57IpnZf0diO3
qJ6k5pw/8FvVm20nSuvhM/SdEH9nGQ2SuOWISQQYEQIACQUCSHjemQIbDAAKCRAg
b4GCsZgbaEu6AJ0ceO1s64zSr5fqbPv3A7JHFtMBLQCdGBcBFmKyvFvC1LwX9pb9
keJNaDc=
=UO0s
-----END PGP PUBLIC KEY BLOCK-----
--- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-fedora-11-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
mQINBEnFENYBEADAfS8rlwfS3XRl30FAdOfgRuwAI8W9VA16LZ6nyZG9SE+KcPZz
huoDeufK2xLpjmczLy0bly4pv2lNFWWnrK2jaNbW1bdvU2XyyAZHUha8An6w2wfI
Qqx5uCKpao1cBnH5wqe714sLrG0S2FS/XsLXhKNW8LaeyR0pH2b4pzKUPkr/ObDJ
lWIxj+/p1eYyUJLsHGPiGLDd+FUps4Bd8NyrjNDTPlriMQ9Or2FglJdbgslqN08X
UfGfLXSllSRE8V8AxuN/Il4pa02LpJjX+6FFQCg6dfwX+K7V5UVe+uXIz0OXUPts
PYWv+FUZPGMepV6hRHSZatutN/jy56uRt7N9sqrOL3NAHHAelvS+ET8AeabOVlii
rDVpf7/0P5JYpPQ3zSAPy7tNUs5mbP9mLnO3+LAFSnnoTDL4UU7juiNtzoqkqwHm
eVIh6ltnuECtbfdQQ6jhS9pvcWu2BIxjT/q9LGAzmXVOVyOZCYgApJGyQAQqMHR4
uHHs12bnMWgznoB3fqtkvyqsY5CevEaeEYQtwdhJo+DlC3QAak8kShmvprT0tljg
KVbMjhiNCxBp4erXNl4hZqzNn+WBj16vVkVBzUtnsQfps2VBs1wUlLtMF1gTObG1
bGLCs1JXTZXps7NtuS1GxqW05kX7o480oqTSadi78OiGICtjQn0ZUzgzeQARAQAB
tFZSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxMSkg
PHJwbWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCNgQTAQIA
IAUCScUQ1gIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEE0qG9yNxDhEAhEP
/iNuleDwgMXALmqapYPW4a4XW2OmJCXUS65hawAuAy3XixZHrde7dn/dAlzbqceZ
B4hdTppynsP0rxtSVlXdok9ar6L3mXPzM/sK8IISDOljLvOfINRDsfi+5Mx9C1GT
/IRWJ0gnc5ixVZe9A0CdEk7SwmHQ+b1uQQCpVmEgtTFaVJmOw3j85y7ZzTlYrIQc
n+igiqWMlwKEY1Tby4ixY69qRRE/vgOtuEkBtAM1WP9FV0Hcsl6YJZXepkQdW78l
x8bzeZiA13yCpsBE95tVTtxMWB+BjDFWimheQ3DIC2M7dXkSxTxjN9lhUdVu9b5+
Xt7W8aKHAoTMUuq9LaJeSJeS7N5zN621vN9WtegsvDq5jDPAUzjHYK6LPfYGdWvt
8ZHdpAfGiRDCRFaABwlp9LuBCOmq/clGXFQN+qKnXvrZy/1317Z+r0LU970YdgRv
B2KIC2EuZUJ+if7U2/X0MT4RdomkHPJRy6QJaAychOIszmGyxlATtZzlORzdeFho
1UOJUXCwEKpOpk2Q5cSsxv9isHezvBKx35JAq86CPmWXb+glQB+r5tWA/7prrfbq
Z+pbjOqjT+W38TXBXWS9NYmjF3EmwVZISJR3z4/RO0iSY8P0vmK02vjm3Ux11nJ1
OPxMk799OuxyShHDQ8T/KwOiSJAXJFDqW3GUgie3wTH9
=q3AX
-----END PGP PUBLIC KEY BLOCK-----
--- 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/F-10/rpmfusion-nonfree-rawhide.repo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmfusion-nonfree-rawhide.repo 15 Nov 2008 10:29:04 -0000 1.4
+++ rpmfusion-nonfree-rawhide.repo 17 May 2009 14:35:01 -0000 1.5
@@ -4,7 +4,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
+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
+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
+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/F-10/rpmfusion-nonfree-release.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpmfusion-nonfree-release.spec 15 Nov 2008 10:29:04 -0000 1.7
+++ rpmfusion-nonfree-release.spec 17 May 2009 14:35:01 -0000 1.8
@@ -3,17 +3,19 @@
Name: rpmfusion-%{repo}-release
Version: 10
-Release: 1
+Release: 5
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-10-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
@@ -24,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
@@ -69,13 +61,35 @@
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
# GPG Key
-%{__install} -Dp -m644 %{SOURCE0} \
+%{__install} -Dp -m644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
+# compatibility symlink for easy transition to F11
+ln -s $(basename %{SOURCE10}) $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-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
+
+
# 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-%{...!' %{_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-%{...!' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-updates.repo
+fi
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -85,6 +99,22 @@
%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
+- add post script that switch old config files from serverside mirrorlists to
+ mirrormanager
+
+* Sat May 16 2009 Till Maas <opensource(a)till.name> - 10-3
+- fix symlinks
+
+* Sat May 16 2009 Till Maas <opensource(a)till.name> - 10-2
+- allow easy transition to F11 with new gpg key and naming structure
+
* Sat Nov 15 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 10-1
- build for F-10
Index: rpmfusion-nonfree-updates-testing.repo
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-release/F-10/rpmfusion-nonfree-updates-testing.repo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmfusion-nonfree-updates-testing.repo 3 Nov 2008 13:18:49 -0000 1.3
+++ rpmfusion-nonfree-updates-testing.repo 17 May 2009 14:35:01 -0000 1.4
@@ -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
+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
+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
+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/F-10/rpmfusion-nonfree-updates.repo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmfusion-nonfree-updates.repo 15 Nov 2008 10:29:04 -0000 1.4
+++ rpmfusion-nonfree-updates.repo 17 May 2009 14:35:01 -0000 1.5
@@ -4,7 +4,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-up...
enabled=1
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+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
+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
+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/F-10/rpmfusion-nonfree.repo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmfusion-nonfree.repo 15 Nov 2008 10:29:04 -0000 1.4
+++ rpmfusion-nonfree.repo 17 May 2009 14:35:01 -0000 1.5
@@ -4,7 +4,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$r...
enabled=1
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+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
@@ -12,7 +12,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-de...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+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
@@ -20,5 +20,5 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-so...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch
--- RPM-GPG-KEY-rpmfusion-nonfree-fedora DELETED ---
15 years, 6 months
rpms/rpmfusion-free-release/F-10 rpmfusion-free-rawhide.repo, 1.5, 1.6 rpmfusion-free-release.spec, 1.8, 1.9
by 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-rawhi...
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-rawhi...
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-rawhi...
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
15 years, 6 months
