Author: thl
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-release/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1554
Modified Files:
rpmfusion-nonfree-rawhide.repo rpmfusion-nonfree-release.spec
rpmfusion-nonfree-updates.repo rpmfusion-nonfree.repo
Log Message:
* Sun Nov 22 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 13-1
- Bump for Fedora 13's rawhide.
- Put the version at 13 from the start.
- drop post script
Index: rpmfusion-nonfree-rawhide.repo
===================================================================
RCS file:
/cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-rawhide.repo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmfusion-nonfree-rawhide.repo 15 Nov 2009 12:11:05 -0000 1.9
+++ rpmfusion-nonfree-rawhide.repo 22 Nov 2009 13:44:09 -0000 1.10
@@ -2,7 +2,7 @@
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=0
+enabled=1
gpgcheck=1
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rpmfusion-nonfree-release.spec 15 Nov 2009 12:11:05 -0000 1.13
+++ rpmfusion-nonfree-release.spec 22 Nov 2009 13:44:09 -0000 1.14
@@ -2,8 +2,8 @@
%define repo nonfree
Name: rpmfusion-%{repo}-release
-Version: 12
-Release: 1
+Version: 13
+Release: 0.1
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
@@ -78,14 +78,6 @@
# 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
@@ -96,6 +88,11 @@
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
+* Sun Nov 22 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 13-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
Index: rpmfusion-nonfree-updates.repo
===================================================================
RCS file:
/cvs/nonfree/rpms/rpmfusion-nonfree-release/devel/rpmfusion-nonfree-updates.repo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmfusion-nonfree-updates.repo 15 Nov 2009 12:11:05 -0000 1.9
+++ rpmfusion-nonfree-updates.repo 22 Nov 2009 13:44:09 -0000 1.10
@@ -2,7 +2,7 @@
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=1
+enabled=0
gpgcheck=1
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmfusion-nonfree.repo 15 Nov 2009 12:11:05 -0000 1.9
+++ rpmfusion-nonfree.repo 22 Nov 2009 13:44:09 -0000 1.10
@@ -2,7 +2,7 @@
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=1
+enabled=0
metadata_expire=7d
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever-$basearch