From 5f00cb35c56e0656efbf7f592208352b2f442243 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sun, 12 Feb 2012 08:04:42 -0600 Subject: [PATCH] Update repo commands to use branched release Now that we have branched we want the default repo commands to point to the branched release, not rawhide. There is an empty updates repo, so it's safe to uncomment the updates repo as well. --- configure.ac | 2 +- fedora-aos.ks | 6 +++--- fedora-live-base.ks | 6 +++--- fedora-live-mini.ks | 6 +++--- spin-kickstarts.spec.in | 3 +++ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 9fe6306..486b437 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([spin-kickstarts], 0.17.0) +AC_INIT([spin-kickstarts], 0.17.1) AC_SUBST([RELEASE], 1) ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms nb nl or pa pl pt pt_BR ru sk sl sr@latin sr sv ta tr uk zh_CN zh_TW" diff --git a/fedora-aos.ks b/fedora-aos.ks index 9d93113..5d8b0b8 100644 --- a/fedora-aos.ks +++ b/fedora-aos.ks @@ -26,9 +26,9 @@ part / --size 1024 --fstype ext4 --ondisk sda # # Repositories # -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch +#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch +repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch +repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch #repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch # diff --git a/fedora-live-base.ks b/fedora-live-base.ks index 1e723a9..0b14fec 100644 --- a/fedora-live-base.ks +++ b/fedora-live-base.ks @@ -17,9 +17,9 @@ xconfig --startxonboot part / --size 3072 --fstype ext4 services --enabled=NetworkManager --disabled=network,sshd -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch +#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch +repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch +repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch #repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch %packages diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks index 86bd1dd..694cd6c 100644 --- a/fedora-live-mini.ks +++ b/fedora-live-mini.ks @@ -12,9 +12,9 @@ xconfig --startxonboot part / --size 4096 --fstype ext4 services --enabled=NetworkManager,messagebus,avahi-daemon --disabled=network,sshd,iscsi,iscsid,lldpad -repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch -#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch +#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch +repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch +repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch #repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch %packages diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in index 9405f57..d937c05 100644 --- a/spin-kickstarts.spec.in +++ b/spin-kickstarts.spec.in @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/%{name}/l10n/README %changelog +* Sun Feb 12 2012 Bruno Wolff III 0.17.1-1 +- Rebuild post branch to build from branch repos + * Tue Oct 25 2011 Bruno Wolff III 0.17.0-1 - Initial build of f17 version - Use rawhide repo by default for live images