Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-infrastructure

This commit is contained in:
Jason Tibbitts 2010-08-05 14:18:38 -05:00
commit d6faa0e008
5 changed files with 73 additions and 69 deletions

View file

@ -6,11 +6,29 @@ TEXT HELP
Install currently supported versionf of Fedora
ENDTEXT
label Fedora-13-i386
MENU LABEL Fedora-13-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/images/pxeboot/initrd.img
append method=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/
TEXT HELP
Selecting this will boot the Fedora 13 i386 installer.
ENDTEXT
label Fedora-13-x86_64
MENU LABEL Fedora-13-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/images/pxeboot/initrd.img
append method=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/
TEXT HELP
Selecting this will boot the Fedora 13 x86_64 installer.
ENDTEXT
label Fedora-12-i386
MENU LABEL Fedora-12-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/12/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/12/Fedora/i386/os/images/pxeboot/initrd.img
append method=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Fedora/x86_64/os/
append method=http://download.fedoraproject.org/pub/fedora/linux/releases/12/Fedora/i386/os/
TEXT HELP
Selecting this will boot the Fedora 12 i386 installer.
ENDTEXT
@ -24,40 +42,24 @@ label Fedora-12-x86_64
Selecting this will boot the Fedora 12 x86_64 installer.
ENDTEXT
label Fedora-11-i386
MENU LABEL Fedora-11-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/initrd.img
append method=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/i386/os/
label Fedora-14-branched-development-i386
MENU LABEL Fedora-14-branched-development-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/development/14/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/pub/fedora/linux/development/14/i386/os/images/pxeboot/initrd.img
append method=http://download.fedoraproject.org/pub/fedora/linux/development/14/i386/os/
TEXT HELP
Selecting this will boot the Fedora 11 i386 installer.
Selecting this will boot the Fedora 14 branched i386 installer.
NOTE: This is an untested development version
ENDTEXT
label Fedora-11-x86_64
MENU LABEL Fedora-11-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/x86_64/os/images/pxeboot/initrd.img
append method=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/x86_64/os/
label Fedora-14-branched-development-x86_64
MENU LABEL Fedora-14-branched-development-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/development/14/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/development/14/x86_64/os/images/pxeboot/initrd.img
append method=http://download.fedoraproject.org/pub/fedora/linux/development/14/x86_64/os/
TEXT HELP
Selecting this will boot the Fedora 11 x86_64 installer.
ENDTEXT
label Fedora-13-Beta-i386
MENU LABEL Fedora-13-Beta-i386
kernel http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/i386/os/images/pxeboot/initrd.img
append method=http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/i386/os/
TEXT HELP
Selecting this will boot the Fedora 13 Beta i386 installer.
ENDTEXT
label Fedora-13-Beta-x86_64
MENU LABEL Fedora-13-Beta-x86_64
kernel http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/x86_64/os/images/pxeboot/initrd.img
append method=http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/x86_64/os/
TEXT HELP
Selecting this will boot the Fedora 13 Beta x86_64 installer.
Selecting this will boot the Fedora 14 branched x86_64 installer.
NOTE: This is an untested development version
ENDTEXT
label uplvl

View file

@ -7,6 +7,25 @@ TEXT HELP
Rescue currently supported versionf of Fedora
ENDTEXT
label Fedora-13-i386-rescue
MENU LABEL Fedora-13-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/images/pxeboot/initrd.img
append rescue method=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/i386/os/
TEXT HELP
Selecting this will boot Fedora 13 i386 in rescue mode
ENDTEXT
label Fedora-13-x86_64-rescue
MENU LABEL Fedora-13-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/images/pxeboot/initrd.img
append rescue method=http://download.fedoraproject.org/pub/fedora/linux/releases/13/Fedora/x86_64/os/
TEXT HELP
Selecting this will boot Fedora 13 x86_64 in rescue mode
ENDTEXT
label Fedora-12-i386-rescue
MENU LABEL Fedora-12-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/12/Fedora/i386/os/images/pxeboot/vmlinuz
@ -25,44 +44,26 @@ label Fedora-12-x86_64-rescue
Selecting this will boot Fedora 12 x86_64 in rescue mode
ENDTEXT
label Fedora-11-i386-rescue
MENU LABEL Fedora-11-i386
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/i386/os/images/pxeboot/initrd.img
append rescue method=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/i386/os/
label Fedora-14-branched-development-i386-rescue
MENU LABEL Fedora-14-branched-development-i386-rescue
kernel http://download.fedoraproject.org/pub/fedora/linux/development/14/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/pub/fedora/linux/development/14/i386/os/images/pxeboot/initrd.img
append rescue method=http://download.fedoraproject.org/pub/fedora/linux/development/14/i386/os/
TEXT HELP
Selecting this will boot Fedora 11 i386 in rescue mode
Selecting this will boot the Fedora 14 branched i386 installer.
NOTE: This is an untested development version
ENDTEXT
label Fedora-11-x86_64-rescue
MENU LABEL Fedora-11-x86_64
kernel http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/x86_64/os/images/pxeboot/initrd.img
append rescue method=http://download.fedoraproject.org/pub/fedora/linux/releases/11/Fedora/x86_64/os/
label Fedora-14-branched-development-x86_64-rescue
MENU LABEL Fedora-14-branched-development-x86_64-rescue
kernel http://download.fedoraproject.org/pub/fedora/linux/development/14/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedoraproject.org/pub/fedora/linux/development/14/x86_64/os/images/pxeboot/initrd.img
append rescue method=http://download.fedoraproject.org/pub/fedora/linux/development/14/x86_64/os/
TEXT HELP
Selecting this will boot Fedora 11 x86_64 in rescue mode
Selecting this will boot the Fedora 14 branched x86_64 installer.
NOTE: This is an untested development version
ENDTEXT
label Fedora-13-Beta-i386
MENU LABEL Fedora-13-Beta-i386
kernel http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/i386/os/images/pxeboot/vmlinuz
initrd http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/i386/os/images/pxeboot/initrd.img
append rescue method=http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/i386/os/
TEXT HELP
Selecting this will boot the Fedora 13 Beta i386 installer.
ENDTEXT
label Fedora-13-Beta-x86_64
MENU LABEL Fedora-13-Beta-x86_64
kernel http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/x86_64/os/images/pxeboot/vmlinuz
initrd http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/x86_64/os/images/pxeboot/initrd.img
append rescue method=http://download.fedora.redhat.com/pub/fedora/linux/releases/test/13-Beta/Fedora/x86_64/os/
TEXT HELP
Selecting this will boot the Fedora 13 Beta x86_64 installer.
ENDTEXT
label uplvl
MENU LABEL Back
MENU EXIT

View file

@ -16,11 +16,12 @@ my.arch.archlist.append('src')
my.setCacheDir()
my.repos.disableRepo('*')
my.add_enable_repo('f13',
baseurls=['http://fedora.mirrors.tds.net/pub/fedora/development/13/source/SRPMS/'])
my.add_enable_repo('f13-updates-testing',
baseurls=['http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/13/SRPMS/'])
baseurls=['http://download.fedora.redhat.com/pub/fedora/linux/releases/13/Everything/source/'])
#my.add_enable_repo('f13-updates-testing',
# baseurls=['http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/13/SRPMS/'])
my.add_enable_repo('f13-updates',
baseurls=['http://download.fedora.redhat.com/pub/fedora/linux/updates/13/SRPMS/'])
baseurls=['http://download.fedora.redhat.com/pub/fedora/linux/updates/13/SRPMS/',
'http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/13/SRPMS/'])
my.add_enable_repo('f12',
baseurls=['http://fedora.mirrors.tds.net/pub/fedora/releases/12/Everything/source/SRPMS/'])
my.add_enable_repo('f12-updates',

View file

@ -60,7 +60,7 @@
<!--<p><small><strong>XHTML:</strong> <?php printf(__('You can use these tags: %s'), allowed_tags()); ?></small></p>-->
<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
<p><textarea name="comment" id="comment" cols="75%" rows="10" tabindex="4"></textarea></p>
<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php echo attribute_escape(__('Submit Comment')); ?>" />
<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />

View file

@ -1,7 +1,7 @@
Summary: Wordpress-MU Theme for Fedora
URL: http://mu.wordpress.org/latest.tar.gz
Name: wordpress-mu-theme-fedora
Version: 1.0
Version: 1.0.1
Release: 1%{?dist}
Group: Applications/Publishing
License: GPLv2