--- rpms/anaconda/sme7/smeserver.patch	2007/06/12 14:39:15	1.1
+++ rpms/anaconda/sme7/smeserver.patch	2007/12/01 03:37:31	1.2
@@ -50,7 +50,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond
 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/instdata.py mezzanine_patched_anaconda-10.1.1.37/instdata.py
 --- anaconda-10.1.1.37/instdata.py	2004-08-25 23:12:10.000000000 +1000
 +++ mezzanine_patched_anaconda-10.1.1.37/instdata.py	2006-04-06 06:44:44.401953223 +1000
-@@ -114,10 +114,7 @@
+@@ -116,10 +116,7 @@
  
      def write(self, instPath):
          self.langSupport.write (instPath)
@@ -62,7 +62,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond
          self.timezone.write (instPath)
          self.auth.write (instPath)
  	self.firewall.write (instPath)
-@@ -170,8 +167,8 @@
+@@ -172,8 +169,8 @@
  
  	self.instLanguage.writeKS(f)
  	self.langSupport.writeKS(f)
@@ -380,9 +380,9 @@ diff -Nur -x '*.orig' -x '*.rej' anacond
 diff -Nur -x '*.orig' -x '*.rej' anaconda-10.1.1.37/upgrade.py mezzanine_patched_anaconda-10.1.1.37/upgrade.py
 --- anaconda-10.1.1.37/upgrade.py	2006-04-06 06:59:28.387445237 +1000
 +++ mezzanine_patched_anaconda-10.1.1.37/upgrade.py	2006-04-06 06:50:27.473356801 +1000
-@@ -38,6 +38,21 @@
- upgrade_remove_blacklist = ()
- 
+@@ -49,6 +49,21 @@
+     upgrade_remove_blacklist = ( ("samba","ppc64"),)
+
  def findRootParts(intf, id, dispatch, dir, chroot):
 +#    w = intf.waitWindow(_("Converting to RAID"),
 +#        _("Converting to RAID, this may take several minutes..."))
@@ -402,7 +402,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond
      if dir == DISPATCH_BACK:
          return
      if id.rootParts is None:
-@@ -49,7 +64,7 @@
+@@ -60,7 +75,7 @@
  
      if id.rootParts is not None and len(id.rootParts) > 0:
          dispatch.skipStep("findinstall", skip = 0)
@@ -411,7 +411,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond
              dispatch.skipStep("installtype", skip = 1)
      else:
          dispatch.skipStep("findinstall", skip = 1)
-@@ -501,10 +516,10 @@
+@@ -513,10 +528,10 @@
                  pass
              sys.exit(0)
  
@@ -424,7 +424,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond
                                    "that this is not a %s system. "
                                    "Continuing with the upgrade process may "
                                    "leave the system in an unusable state.  Do "
-@@ -521,7 +536,7 @@
+@@ -533,7 +548,7 @@
      # Figure out current version for upgrade nag and for determining weird
      # upgrade cases
      supportedUpgradeVersion = -1
@@ -433,7 +433,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond
      for h in mi:
          if h[rpm.RPMTAG_EPOCH] is None:
              epoch = None
-@@ -529,7 +544,7 @@
+@@ -541,7 +556,7 @@
              epoch = str(h[rpm.RPMTAG_EPOCH])
  
          if supportedUpgradeVersion <= 0:
@@ -442,7 +442,7 @@ diff -Nur -x '*.orig' -x '*.rej' anacond
                                     (epoch, h[rpm.RPMTAG_VERSION],
                                      h[rpm.RPMTAG_RELEASE]))
              if val > 0:
-@@ -538,9 +553,6 @@
+@@ -550,9 +565,6 @@
                  supportedUpgradeVersion = 1
                  break