--- rpms/anaconda/sme8/anaconda-11.1.2.87-smeserver.patch	2008/03/18 19:44:09	1.10
+++ rpms/anaconda/sme8/anaconda-11.1.2.87-smeserver.patch	2008/03/31 20:07:59	1.12
@@ -47,25 +47,12 @@
  
  	return INSTALL_OK
  
---- anaconda-11.1.2.87/textw/upgrade_bootloader_text.py.smeserver	2006-05-04 13:58:53.000000000 -0600
-+++ anaconda-11.1.2.87/textw/upgrade_bootloader_text.py	2007-12-20 14:23:49.000000000 -0700
-@@ -31,88 +31,11 @@
-         (self.type, self.bootDev) = \
-                     checkbootloader.getBootloaderTypeAndBoot(anaconda.rootPath)
- 
--        blradio = RadioGroup()
--
--        (update, newbl, nobl) = (0, 0, 0)
--        if not self.dispatch.stepInSkipList("bootloader"):
--            newbl = 1
--        elif self.dispatch.stepInSkipList("instbootloader"):
--            nobl = 1
--        else:
--            if self.type is not None and self.bootDev is not None:
--                update = 1
--            else:
--                nobl = 1
--        
+--- anaconda-11.1.2.87/textw/upgrade_bootloader_text.py.sme	2006-05-04 13:58:53.000000000 -0600
++++ anaconda-11.1.2.87/textw/upgrade_bootloader_text.py	2008-03-31 13:13:42.000000000 -0600
+@@ -44,75 +44,24 @@
+             else:
+                 nobl = 1
+         
 -        if self.type is not None and self.bootDev is not None:
 -            t = TextboxReflowed(53,
 -                                _("The installer has detected the %s boot "
@@ -74,7 +61,18 @@
 -
 -            self.update_radio = blradio.add(_("Update boot loader configuration"),
 -                                            "update", update)
--        else:
++        if nobl == 1:
++            self.dispatch.skipStep("bootloadersetup", skip = 1)
++            self.dispatch.skipStep("bootloader", skip = 1)
++            self.dispatch.skipStep("bootloaderadvanced", skip = 1)
++            self.dispatch.skipStep("instbootloader", skip = 1)
++        elif newbl == 1:
++            self.dispatch.skipStep("bootloadersetup", skip = 0)
++            self.dispatch.skipStep("bootloader", skip = 1)
++            self.dispatch.skipStep("bootloaderadvanced", skip = 1)
++            self.dispatch.skipStep("instbootloader", skip = 0)
++            self.bl.doUpgradeOnly = 0
+         else:
 -            t = TextboxReflowed(53,
 -                  _("The installer is unable to detect the boot loader "
 -                    "currently in use on your system."))
@@ -135,16 +133,16 @@
 -                self.bl.setDevice(self.bootDev)
 -
 -
--
++            self.dispatch.skipStep("bootloadersetup", skip = 0)
++            self.dispatch.skipStep("bootloader", skip = 1)
++            self.dispatch.skipStep("bootloaderadvanced", skip = 1)
++            self.dispatch.skipStep("instbootloader", skip = 0)
++            self.bl.doUpgradeOnly = 1
++            self.bl.useGrubVal = 1
++            self.bl.setDevice(self.bootDev)
+ 
 -            screen.popWindow()
 -            return INSTALL_OK
-+        self.dispatch.skipStep("bootloadersetup", skip = 0)
-+        self.dispatch.skipStep("bootloader", skip = 1)
-+        self.dispatch.skipStep("bootloaderadvanced", skip = 1)
-+        self.dispatch.skipStep("instbootloader", skip = 0)
-+        self.bl.doUpgradeOnly = 1
-+        self.bl.useGrubVal = 1
-+        self.bl.setDevice(self.bootDev)
 +        return INSTALL_OK
 --- anaconda-11.1.2.87/textw/upgrade_text.py.smeserver	2007-01-22 16:14:06.000000000 -0700
 +++ anaconda-11.1.2.87/textw/upgrade_text.py	2007-12-20 13:59:27.000000000 -0700
@@ -578,7 +576,7 @@
              n, a, e, v, r = pkgtup
              if supportedUpgradeVersion <= 0:
 -                val = rpmUtils.miscutils.compareEVR((None, '3', '1'),
-+                val = rpmUtils.miscutils.compareEVR(('26', '7.3', '1.el4.sme'),
++                val = rpmUtils.miscutils.compareEVR(('26', '7.0', '01'),
                                                      (e, v,r))
                  if val > 0:
                      supportedUpgradeVersion = 0