rpms/booty/F-9 booty-0.104-fixgetSparcMachinecall.patch, NONE, 1.1 booty.spec, 1.79, 1.80

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/booty/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3342

Modified Files:
	booty.spec 
Added Files:
	booty-0.104-fixgetSparcMachinecall.patch 
Log Message:
fix getSparcMachine() call

booty-0.104-fixgetSparcMachinecall.patch:

--- NEW FILE booty-0.104-fixgetSparcMachinecall.patch ---
diff -up booty-0.104/bootloaderInfo.py.BAD booty-0.104/bootloaderInfo.py
--- booty-0.104/bootloaderInfo.py.BAD	2008-12-12 17:36:56.000000000 -0500
+++ booty-0.104/bootloaderInfo.py	2008-12-12 17:40:08.000000000 -0500
@@ -2029,9 +2029,7 @@ class sparcBootloaderInfo(bootloaderInfo
 
         backup = "%s/backup.b" % (cfPath,)
         sbinargs = ["/sbin/silo", "-f", "-C", cf, "-S", backup]
-        # TODO!!!  FIXME!!!  XXX!!!
-        # butil is not defined!!!  - assume this is in rhpl now?
-        if butil.getSparcMachine() == "sun4u":
+        if (rhpl.getSparcMachine() == "sun4u" or rhpl.getSparcMachine() == "sun4v"):
             sbinargs += ["-u"]
         else:
             sbinargs += ["-U"]


Index: booty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/booty/F-9/booty.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- booty.spec	8 Apr 2008 20:26:43 -0000	1.79
+++ booty.spec	12 Dec 2008 22:43:40 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: simple python bootloader config lib
 Name: booty
 Version: 0.104
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Source0: %{name}-%{version}.tar.bz2
 Group: System Environment/Libraries
@@ -9,6 +9,7 @@
 Requires: rhpl
 BuildRequires: python-devel
 BuildArch: noarch
+Patch0: booty-0.104-fixgetSparcMachinecall.patch
 
 %description
 Small python library for use with bootloader configuration by anaconda
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -35,6 +37,9 @@
 
 
 %changelog
+* Fri Dec 12 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.104-2
+- fix getSparcMachine() call
+
 * Tue Apr  8 2008 Jeremy Katz <katzj at redhat.com> - 0.104-1
 - Pegasos fix (dwmw2)
 - Fix printing of boot message on ppc (clumens, #235005)