- almost works

Changed files:
    anaconda-installclass-pld.py -> 1.6
    anaconda.spec -> 1.85

diff --git a/anaconda-installclass-pld.py b/anaconda-installclass-pld.py
index 5760f6fe4ab1faa1e6cdb8f946c6b4fa469f01e6..d63f1cd1c007d8030308ce1e7505d58766eafd16 100644 (file)
--- a/anaconda-installclass-pld.py
+++ b/anaconda-installclass-pld.py
@@ -1,7 +1,6 @@
 from installclass import BaseInstallClass
 from installclass import BaseInstallClass

-import rhpl
-from rhpl.translate import N_

 from constants import *
 from constants import *

+from filer import *

 from flags import flags
 import os
 import iutil
 from flags import flags
 import os
 import iutil


@@ -12,6 +11,9 @@ try:
 except ImportError:
     instnum = None
 
 except ImportError:
     instnum = None
 

+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+

 import logging
 log = logging.getLogger("anaconda")
 
 import logging
 log = logging.getLogger("anaconda")
 


@@ -21,15 +23,16 @@ class InstallClass(BaseInstallClass):
     id = "pld"
     name = N_("PLD Linux")
     pixmap = "custom.png"
     id = "pld"
     name = N_("PLD Linux")
     pixmap = "custom.png"

-    _description = N_("Select this installation type to gain complete "
-                    "control over the installation process, including "
-                    "software package selection and partitioning.")
+    _description = N_("The default installation of %s includes a set of "
+                     "software applicable for general internet usage. "
+                     "What additional tasks would you like your system "
+                     "to include support for?")

     _descriptionFields = (productName,)
     sortPriority = 10000
     allowExtraRepos = True
 
     repopaths = { "base": ["PLD/i686/RPMS", "PLD/noarch/RPMS"], }
     _descriptionFields = (productName,)
     sortPriority = 10000
     allowExtraRepos = True
 
     repopaths = { "base": ["PLD/i686/RPMS", "PLD/noarch/RPMS"], }

-    tasks = [
+    taskMap = {'client': [

         (N_("GNOME Desktop"), [
             "gnome",
             "gnome_complete",
         (N_("GNOME Desktop"), [
             "gnome",
             "gnome_complete",


@@ -59,7 +62,7 @@ class InstallClass(BaseInstallClass):
         (N_("Java Development Tools"), [
             "java"
         ]),
         (N_("Java Development Tools"), [
             "java"
         ]),

-    ]
+    ]}

 
     def setInstallData(self, anaconda):
        BaseInstallClass.setInstallData(self, anaconda)
 
     def setInstallData(self, anaconda):
        BaseInstallClass.setInstallData(self, anaconda)


@@ -156,7 +159,7 @@ class InstallClass(BaseInstallClass):
 
         log.info("repopaths is %s" %(self.repopaths,))
 
 
         log.info("repopaths is %s" %(self.repopaths,))
 

-    def getBackend(self, methodstr):
+    def getBackend(self):

         return yuminstall.YumBackend
 
     def __init__(self, expert):
         return yuminstall.YumBackend
 
     def __init__(self, expert):

diff --git a/anaconda.spec b/anaconda.spec
index 5cdc8461b93decf81153b6a6bc1e4e60139effa9..8bb75b39b878e040b88b7ebcc5f762c78ef97112 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -79,7 +79,6 @@ BuildRequires:        glib2-static
 BuildRequires: glibc-static
 BuildRequires: gtk+2-devel
 BuildRequires: isomd5sum-devel
 BuildRequires: glibc-static
 BuildRequires: gtk+2-devel
 BuildRequires: isomd5sum-devel

-BuildRequires: kudzu-devel >= 1.2.68

 BuildRequires: libdhcp-devel
 BuildRequires: libdhcp-static
 BuildRequires: libdhcp4client-devel
 BuildRequires: libdhcp-devel
 BuildRequires: libdhcp-static
 BuildRequires: libdhcp4client-devel


@@ -103,23 +102,24 @@ Requires: bdevid
 Requires:      device-mapper >= 1.01.05
 Requires:      dosfstools
 Requires:      e2fsprogs
 Requires:      device-mapper >= 1.01.05
 Requires:      dosfstools
 Requires:      e2fsprogs

-Requires:      glibc-localedb-all
+#Requires:     glibc-localedb-all

 Requires:      grubby
 Requires:      hal
 Requires:      hfsutils
 Requires:      jfsutils
 Requires:      grubby
 Requires:      hal
 Requires:      hfsutils
 Requires:      jfsutils

-Requires:      kudzu >= 1.2.34.3-1.1

 Requires:      lvm2
 Requires:      mdadm
 Requires:      python-bdevid >= 6.0.24
 Requires:      python-booty >= 0.93
 Requires:      lvm2
 Requires:      mdadm
 Requires:      python-bdevid >= 6.0.24
 Requires:      python-booty >= 0.93

+Requires:      python-cracklib

 Requires:      python-dbus
 Requires:      python-devel-tools
 Requires:      python-dbus
 Requires:      python-devel-tools

+Requires:      python-iniparse

 Requires:      python-kickstart >= 1.42
 Requires:      python-libuser
 Requires:      python-libxml2
 Requires:      python-parted >= 1.8.9
 Requires:      python-kickstart >= 1.42
 Requires:      python-libuser
 Requires:      python-libxml2
 Requires:      python-parted >= 1.8.9

-Requires:      python-rhpl >= 0.212
+Requires:      python-rhpl >= 0.216

 Requires:      python-rpm >= 4.2-0.61
 Requires:      python-selinux
 Requires:      python-snack
 Requires:      python-rpm >= 4.2-0.61
 Requires:      python-selinux
 Requires:      python-snack