4:49 p.m.
Author: robert
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/EL-6
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4958
Modified Files:
rpmfusion-nonfree-release.spec
rpmfusion-nonfree-updates-testing.repo
rpmfusion-nonfree-updates.repo
Added Files:
RPM-GPG-KEY-rpmfusion-nonfree-el-6
Removed Files:
RPM-GPG-KEY-rpmfusion-nonfree-fedora-13-primary
RPM-GPG-KEY-rpmfusion-nonfree-fedora-14-primary
RPM-GPG-KEY-rpmfusion-nonfree-fedora-15-primary
rpmfusion-nonfree-rawhide.repo rpmfusion-nonfree.repo
Log Message:
Initial RPM release based on Thorsten Leemhuis' work for EL-5
--- NEW FILE RPM-GPG-KEY-rpmfusion-nonfree-el-6 ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
mQINBEy53pkBEAC7tgADsKPyzLOqMfPT1FxFWcTFoNtthLYZxZwFsjvZxNQJP7VZ
ja0gO0OFUl4izDNwK6eClRgNrHX7x6pKl64Nf8hk6uJCyRO4eFbdw6SK5X1LMoys
d62yDOu07MIIGLGzzpXG6cxCVaJ9lLXNWykJQT3807kptwRzajxgEK2AjcHpW9ij
OzC4gjfbeOTEL9glgu9LM75J8WcdNlXhg5HZEVA7vpAgTkGA635Y0l/8ZRBvE3V6
D4/BBxS4MsuWK4HiosgZUxrrzsP8UeHTmeXimupVnMZXkgPtZjZwP5G0ShZVpwY3
oKev2lYf7dNQVsThT0yxemAWb6sXaaUm5c9sMoJ0acktVl2425DxDnJLvN685pAG
NZWJINtHi8jMFSHwfnHo/sQDMQQy09sGt9ruglFWTUBsK7goFtarBy9clukRck7k
TWfxtSXIGJgoiEZbCyJ13YrEbeT7+T8f0ocGb4yZ6IsUTORb1eSpIjVqN3Dv/UEl
nSdZK+OsQ6MRVks2hhn4s4BLQO33d3wMRmQkYyH16aGJQGxxilTl58udFd9EbOYB
MDEEKJxv0uJOjOKUZHbUpzqfq4c0HuoI7CdaZSh/h13vWdLVFVwMGGKoeyRs1Qx4
c8+weWrIuElr6xAMB1TCCjIUixQj5T2Qj2lMKWVS2y2HecH5Met5dgZYxwARAQAB
tFFSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRUwgKDYpIDxycG1m
dXNpb24tYnVpbGRzeXNAbGlzdHMucnBtZnVzaW9uLm9yZz6JAjYEEwECACAFAky5
3pkCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCLDw/tVWi7smLQD/4q1yA8
l/Thto31tdrUWHi2YTVLTf/1jTZKqnlSZLkih3BMaUTRd2rAVUDf0TneRasnYlGf
Xh95dPbpFRb6yWDYrVa3+06KCAEhvCqIqmekjZ9qd9VtA4LrXOPQCe0008KLXHgv
9UaManPTmog5dvCjIda0gyDEBTxnjseQ7b+56hW3wMz8DDk1fT2uoi8e+zP16Rga
NygjOwUDwpJSKUXHYxpgyh8C0vOFlcsUJ/RZR0k2DgQUtdNzQpp8yN7zFIy5d2kp
SdJ2Ae9QzQryjYxvNpA/48h8873UxNpB6dx4moKFbeC/YVX+3nJL0dAV3lRAKU7F
UNPnei5wiaN2Mwm0oEMiTfZCxshjh8JZgWnlZ5//5IoczTXgLrfyHUxW2oPBk5cs
34iB8vCGTvH/cHFQh9kHPJB+tJSnv+NYgpXoRkw5ZHkts1LV68PKjw0FA/T4Hfl0
Atv6YZ242e1+fAJJ9iSKmYRNBWXBGBzt0Rxb3oddbO1mTFPlBHzyQwLVUR/M6Q2R
72yG6e+7tLgJDiTRy522ui2GWgA8WZo0J5XFXbjM/9iVNvrftKe0uTTUq0A39l6S
0Kd/7xbonpKJcsmM8xn3nUTU0yrSIl3VckBQHufkXhXO9XP13+8iQoJhNazufjKL
bdTr4PZ3NOhXiTRgfdhUcCjz+X1sH3leoVxFaA==
=uRut
-----END PGP PUBLIC KEY BLOCK-----
Index: rpmfusion-nonfree-release.spec
===================================================================
RCS file:
/cvs/nonfree/rpms/rpmfusion-nonfree-release/EL-6/rpmfusion-nonfree-release.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rpmfusion-nonfree-release.spec 26 Oct 2010 17:51:11 -0000 1.19
+++ rpmfusion-nonfree-release.spec 14 May 2011 16:49:25 -0000 1.20
@@ -2,23 +2,23 @@
%define repo nonfree
Name: rpmfusion-%{repo}-release
-Version: 15
+Version: 6
Release: 0.1
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
License: BSD
URL: http://rpmfusion.org
-Source1: rpmfusion-%{repo}.repo
+Source0: RPM-GPG-KEY-rpmfusion-%{repo}-el-6
+# not needed for now, but maybe we'll do that later:
+# Source1: rpmfusion-%{repo}.repo
Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
-Source4: rpmfusion-%{repo}-rawhide.repo
-Source14: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-14-primary
-Source15: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-15-primary
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: system-release >= %{version}
+Requires: redhat-release >= %{version}
+Requires: epel-release >= %{version}
# If apt is around, it needs to be a version with repomd support
Conflicts: apt < 0.5.15lorg3
@@ -28,7 +28,7 @@
%description
RPM Fusion repository contains open source and other distributable software for
-Fedora. It is the merger of the Dribble, FreshRPMs and Livna repositories.
+EL + EPEL. It is the merger of the Dribble, FreshRPMs and Livna repositories.
This package contains the RPM Fusion GPG key as well as Yum package manager
configuration files for RPM Fusion's "nonfree" repository, which holds
@@ -37,7 +37,7 @@
%else
%description
RPM Fusion repository contains open source and other distributable software for
-Fedora. It is the merger of the Dribble, FreshRPMs and Livna repositories.
+EL + EPEL. It is the merger of the Dribble, FreshRPMs and Livna repositories.
This package contains the RPM Fusion GPG key as well as Yum package manager
configuration files for RPM Fusion's "free" repository, which holds only
@@ -60,28 +60,13 @@
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
# GPG Key
-%{__install} -Dp -m644 \
- %{SOURCE14} \
- %{SOURCE15} \
+%{__install} -Dp -m644 %{SOURCE0} \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
-# compatibility symlink for easy transition to F11
-ln -s $(basename %{SOURCE14})
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
-
-# Links for the keys
-for i in i386 x86_64; do
- ln -s $(basename %{SOURCE14})
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-14-${i}
- ln -s $(basename %{SOURCE15})
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-15-${i}
- ln -s $(basename %{SOURCE14})
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-latest-${i}
- ln -s $(basename %{SOURCE15})
$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} \
+%{__install} -p -m644 %{SOURCE2} %{SOURCE3} \
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -91,121 +76,5 @@
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
-* Tue Oct 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 15-0.1
-- build for rawhide
-
-* Sat Oct 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.4
-- drop ppc
-- add key for F-15, drop the one for F-13
-
-* Sun Oct 10 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.3
-- branching for F14: disable rawhide, enable everything and updates
-
-* Mon Apr 26 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.2
-- fix compatibility symlink
-
-* Sat Apr 24 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 14-0.1
-- rebuild for rawhide
-
-* Fri Apr 16 2010 Thorsten Leemhuis <fedora at leemhuis.info> - 13-1
-- add key for Rawhide/F14
-- remove key for F12
-
-* Sun Nov 22 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 13-0.1
-- Bump for Fedora 13's rawhide.
-- Put the version at 13 from the start.
-- drop post script
-
-* Sun Nov 15 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 12-1
-- F12 release: disable rawhide, enable everything and updates
-- remove key for F11
-- add key for F13
-
-* Thu Jun 11 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 11.90-1
-- build for rawhide (enable rawhide, disable all the other repos)
-
-* 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
-
-* Sat Mar 21 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10.90-2
-- add new key for SHA256 signatures
-- use the same structure for keys as fedora does
-
-* Wed Nov 26 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 10.90-1
-- Initial build for Fedora 11.
-
-* Sat Nov 15 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 10-1
-- build for F-10
-
-* Mon Nov 03 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-5
-- enable the proper mirrormanager server in the repo files
-
-* Sat Oct 04 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-4
-- require system-release instead of fedora-release
-
-* Tue Sep 30 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-3
-- s|download.rpmfusion.org|download1.rpmfusion.org|' *.repo
-- s|basearch/debug/|basearch/os/debug/|" in *rawhide.repo
-
-* Sun Sep 28 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-2
-- Fix rpmfusion-rpmfusion typo (again)
-- update summary to properly say free or nonfree
-
-* Sat Sep 27 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9.90-1
-- 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
-- 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
-- Fix rpmfusion-rpmfusion typo
-
-* Mon Aug 18 2008 Stewart Adam <s.adam at diffingo.com> - 9-5
-- Use mirrors.rpmfusion.org instead of rpmfusion.org/mirrorlist
-- Use download.rpmfusion.org instead of download1.rpmfusion.org
-
-* Fri Aug 15 2008 Stewart Adam <s.adam at diffingo.com> - 9-4
-- Only include provides/obsoletes for pre-merger release RPMs in nonfree
-- Remove GPL doc
-
-* Thu Aug 14 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 9-3
-- add conditionals and macros to use one spec file for both free and nonfree
-- some cleanups
-
-* Wed Aug 13 2008 Stewart Adam <s.adam at diffingo.com> - 9-2
-- Split into free and non-free RPMs based on original release RPM
-- Remove double BuildArch
-- Remove GPL source
-- Fix mirror URLs
-- devel --> rawhide
-
-* Tue Aug 12 2008 Stewart Adam <s.adam at diffingo.com> - 9-1
-- Initial RPM release
-
+* Sun May 01 2011 Robert Scheck <robert(a)fedoraproject.org> 6-0.1
+- Initial RPM release based on Thorsten Leemhuis' work for EL-5
Index: rpmfusion-nonfree-updates-testing.repo
===================================================================
RCS file:
/cvs/nonfree/rpms/rpmfusion-nonfree-release/EL-6/rpmfusion-nonfree-updates-testing.repo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmfusion-nonfree-updates-testing.repo 17 May 2009 15:20:09 -0000 1.5
+++ rpmfusion-nonfree-updates-testing.repo 14 May 2011 16:49:25 -0000 1.6
@@ -1,24 +1,24 @@
[rpmfusion-nonfree-updates-testing]
-name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-testing-$releasever&arch=$basearch
-enabled=0
+name=RPM Fusion for EL 6 - Nonfree - Test Updates
+#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/testing/6/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-testing-6&arch=$basearch
+enabled=1
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-6
[rpmfusion-nonfree-updates-testing-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/debug/
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-testing-debug-$releasever&arch=$basearch
+name=RPM Fusion for EL 6 - Nonfree - Test Updates Debug
+#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/testing/6/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-testing-debug-6&arch=$basearch
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-6
[rpmfusion-nonfree-updates-testing-source]
-name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/SRPMS/
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-testing-source-$releasever&arch=$basearch
+name=RPM Fusion for EL 6 - Nonfree - Test Updates Source
+#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/testing/6/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-testing-source-6&arch=$basearch
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-6
Index: rpmfusion-nonfree-updates.repo
===================================================================
RCS file:
/cvs/nonfree/rpms/rpmfusion-nonfree-release/EL-6/rpmfusion-nonfree-updates.repo,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rpmfusion-nonfree-updates.repo 26 Oct 2010 17:51:11 -0000 1.12
+++ rpmfusion-nonfree-updates.repo 14 May 2011 16:49:25 -0000 1.13
@@ -1,24 +1,24 @@
[rpmfusion-nonfree-updates]
-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-updates-released-$releasever&arch=$basearch
-enabled=0
+name=RPM Fusion for EL 6 - Nonfree - Updates
+#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/6/$basearch/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-released-6&arch=$basearch
+enabled=1
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-6
[rpmfusion-nonfree-updates-debuginfo]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
+name=RPM Fusion for EL 6 - Nonfree - Updates Debug
+#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/6/$basearch/debug/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-released-debug-6&arch=$basearch
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-6
[rpmfusion-nonfree-updates-source]
-name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
-mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
+name=RPM Fusion for EL 6 - Nonfree - Updates Source
+#baseurl=http://download1.rpmfusion.org/nonfree/el/updates/6/SRPMS/
+mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-el-updates-released-source-6&arch=$basearch
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-el-6
--- RPM-GPG-KEY-rpmfusion-nonfree-fedora-13-primary DELETED ---
--- RPM-GPG-KEY-rpmfusion-nonfree-fedora-14-primary DELETED ---
--- RPM-GPG-KEY-rpmfusion-nonfree-fedora-15-primary DELETED ---
--- rpmfusion-nonfree-rawhide.repo DELETED ---
--- rpmfusion-nonfree.repo DELETED ---