rpms/preupgrade/devel enable-f9.patch, NONE, 1.1 retrieve-treeinfo-from-instrepo.patch, NONE, 1.1 preupgrade.spec, 1.3, 1.4

[Will Woods (wwoods)]

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv452

Modified Files:
	preupgrade.spec 
Added Files:
	enable-f9.patch retrieve-treeinfo-from-instrepo.patch 
Log Message:
Update to 0.9.3-3 (mostly to avoid upgrade path problems)

enable-f9.patch:

--- NEW FILE enable-f9.patch ---
--- data/releases.list~	2008-05-13 08:41:15.000000000 -0400
+++ data/releases.list	2008-05-13 08:41:15.000000000 -0400
@@ -31,11 +31,11 @@
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/os
 
 # Not available yet
-#[Fedora 9 (Sulphur)]
-#stable=True
-#version=9
-#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
-#installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/9/Fedora/$basearch/os
+[Fedora 9 (Sulphur)]
+stable=True
+version=9
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
+installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/9/Fedora/$basearch/os
 
 [Fedora 8 (Werewolf)]
 # We don't consider this stable, as it's not a supported preupgrade target

retrieve-treeinfo-from-instrepo.patch:

--- NEW FILE retrieve-treeinfo-from-instrepo.patch ---
=== modified file 'preupgrade/__init__.py'
--- preupgrade/__init__.py	2008-05-02 14:50:34 +0000
+++ preupgrade/__init__.py	2008-05-13 18:10:41 +0000
@@ -369,7 +369,7 @@
         # min image
         # example:
         #   http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/.treeinfo
-        tif = self.distrepo.grab.urlopen('/.treeinfo')
+        tif = self.instrepo.grab.urlopen('/.treeinfo')
         #cracked out ppc issues, etc
         archlist = [self.conf.yumvar['basearch']]
         if isParaVirt():



Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/preupgrade.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- preupgrade.spec	2 May 2008 15:42:10 -0000	1.3
+++ preupgrade.spec	13 May 2008 19:23:55 -0000	1.4
@@ -2,10 +2,12 @@
 Summary: Preresolves dependencies and prepares a system for an upgrade
 Name: preupgrade
 Version: 0.9.3
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
+Patch0: enable-f9.patch
+Patch1: retrieve-treeinfo-from-instrepo.patch
 URL: https://fedorahosted.org/preupgrade/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -21,6 +23,8 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%patch1 -p0 
 
 %build
 # no op
@@ -53,6 +57,12 @@
 %{python_sitelib}/%{name}
 
 %changelog
+* Tue May 13 2008 Will Woods <wwoods at redhat.com> - 0.9.3-3
+- Fix hang on "Downloading installer metadata" (bug #446244)
+
+* Tue May 13 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.3-2
+- enable F9 in releases.list
+
 * Fri May  2 2008 Seth Vidal <skvidal at fedoraproject.org> - 0.9.3-1
 - 0.9.3