From 2782f573bcbea3ac5512080be69e95d6a915c139 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Oct 14 2010 22:24:43 +0000 Subject: Set things up for final F14 release --- diff --git a/fedora-release.spec b/fedora-release.spec index 1f329d5..05c43ff 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -4,7 +4,7 @@ Summary: Fedora release files Name: fedora-release Version: 14 -Release: 0.8 +Release: 1 License: GPLv2 Group: System Environment/Base URL: http://fedoraproject.org @@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 14 2010 Jesse Keating - 14-1 +- Enable updates, disable updates-testing, enable metadata_expire + * Tue Aug 17 2010 Bill Nottingham - 14-0.8 - update release name - don't set metadata_expire=7d in fedora.repo (releng #3561) diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo index 83eebe7..bf8d155 100644 --- a/fedora-updates-testing.repo +++ b/fedora-updates-testing.repo @@ -3,7 +3,7 @@ name=Fedora $releasever - $basearch - Test Updates failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=1 +enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch diff --git a/fedora-updates.repo b/fedora-updates.repo index 8a94b16..aef32cf 100644 --- a/fedora-updates.repo +++ b/fedora-updates.repo @@ -3,7 +3,7 @@ name=Fedora $releasever - $basearch - Updates failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -enabled=0 +enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch diff --git a/fedora.repo b/fedora.repo index 97cc401..5e7ec77 100644 --- a/fedora.repo +++ b/fedora.repo @@ -4,6 +4,7 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch enabled=1 +metadata_expire=7d gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch @@ -13,6 +14,7 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch enabled=0 +metadata_expire=7d gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch @@ -22,5 +24,6 @@ failovermethod=priority #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/ mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch enabled=0 +metadata_expire=7d gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch