anaconda-libdir.patch

   1 --- anaconda-11.0.5/Makefile.inc~       2005-06-13 22:09:23.000000000 +0300
   2 +++ anaconda-11.0.5/Makefile.inc        2006-05-18 22:34:08.000000000 +0300
   3 @@ -1,8 +1,8 @@
   4  #
   5  # define destination locations
   6  #
   7 -PYTHONLIBDIR = /usr/lib/anaconda
   8 -RUNTIMEDIR = /usr/lib/anaconda-runtime
   9 +PYTHONLIBDIR = /usr/$(LIBDIR)/anaconda
  10 +RUNTIMEDIR = /usr/$(LIBDIR)/anaconda-runtime
  11  ANACONDADATADIR = /usr/share/anaconda
  12  PYTHON = python2.4
  13  PYTHONINCLUDE = /usr/include/$(PYTHON)
  14 --- ./anaconda  2006-05-18 23:48:57.000000000 +0300
  15 +++ anaconda-11.0.5/anaconda    2006-05-19 00:34:17.000000000 +0300
  16 @@ -275,12 +275,7 @@
  17
  18  # handle updates of just a single file in a python package
  19  def setupPythonUpdates():
  20 -    import glob
  21 -
  22 -    # get the python version.  first of /usr/lib/python*, strip off the
  23 -    # first 15 chars
  24 -    pyvers = glob.glob("/usr/lib/python*")
  25 -    pyver = pyvers[0][15:]
  26 +    pyver = sys.version[:3]
  27
  28      try:
  29         os.mkdir("/tmp/updates")
  30 @@ -289,12 +284,7 @@
  31
  32      for pypkg in ("rhpl", "yum", "rpmUtils", "urlgrabber", "repomd",
  33                   "pykickstart", "rhpxl"):
  34 -       # get the libdir.  *sigh*
  35 -       if os.access("/usr/lib64/python%s/site-packages/%s" %(pyver, pypkg),
  36 -                    os.X_OK):
  37 -           libdir = "lib64"
  38 -       else:
  39 -           libdir = "lib"
  40 +       libdir = sys.lib
  41
  42         if os.access("/mnt/source/RHupdates/%s" %(pypkg,), os.X_OK):
  43             try:
  44 @@ -330,15 +320,15 @@
  45      sys.path.append('textw')
  46      sys.path.append('iw')
  47  else:
  48 -    sys.path.append('/usr/lib/anaconda')
  49 -    sys.path.append('/usr/lib/anaconda/textw')
  50 -    sys.path.append('/usr/lib/anaconda/iw')
  51 +    sys.path.append('/usr/%s/anaconda' % sys.lib)
  52 +    sys.path.append('/usr/%s/anaconda/textw' % sys.lib)
  53 +    sys.path.append('/usr/%s/anaconda/iw' % sys.lib)
  54
  55  if (os.path.exists('booty')):
  56      sys.path.append('booty')
  57      sys.path.append('booty/edd')
  58  else:
  59 -    sys.path.append('/usr/lib/booty')
  60 +    sys.path.append('/usr/%s/booty' % sys.lib)
  61
  62  sys.path.append('/usr/share/system-config-keyboard')
  63  sys.path.append('/usr/share/system-config-date')
  64 @@ -1025,7 +1015,7 @@
  65             if shpid == 0:
  66                 for p in ('/mnt/source/RHupdates/pyrc.py', \
  67                         '/tmp/updates/pyrc.py', \
  68 -                       '/usr/lib/anaconda-runtime/pyrc.py'):
  69 +                       ('/usr/%s/anaconda-runtime/pyrc.py' % sys.lib)):
  70                     if os.access(p, os.R_OK|os.X_OK):
  71                         os.environ['PYTHONSTARTUP'] = p
  72                         break
  73 --- anaconda-11.0.5/installclass.py~    2006-05-19 00:01:55.000000000 +0300
  74 +++ anaconda-11.0.5/installclass.py     2006-05-19 00:01:56.000000000 +0300
  75 @@ -492,7 +492,7 @@
  76      elif os.access("/tmp/product/installclasses", os.R_OK):
  77          path = "/tmp/product/installclasses"
  78      else:
  79 -       path = "/usr/lib/anaconda/installclasses"
  80 +       path = "/usr/%s/anaconda/installclasses" % sys.lib
  81
  82      # append the location of installclasses to the python path so we
  83      # can import them
  84 --- anaconda-11.0.5/language.py 2006-05-19 00:03:47.000000000 +0300
  85 +++ anaconda-11.0.5/language.py 2006-05-19 00:10:52.000000000 +0300
  86 @@ -22,6 +22,7 @@
  87  from rhpl.simpleconfig import SimpleConfigFile
  88
  89  import logging
  90 +import sys
  91  log = logging.getLogger("anaconda")
  92
  93  # Converts a single language into a "language search path". For example,
  94 @@ -58,7 +59,7 @@
  95              self.current = "en_US.UTF-8"
  96
  97          # English name -> native name mapping
  98 -        search = ('lang-names', '/usr/lib/anaconda/lang-names')
  99 +        search = ('lang-names', ('/usr/%s/anaconda/lang-names' % sys.lib))
 100          for path in search:
 101              if os.access(path, os.R_OK):
 102                  f = open(path, 'r')
 103 @@ -73,7 +74,7 @@
 104          # nick -> (name, short name, font, keyboard, timezone) mapping
 105          search = ('lang-table', '/tmp/updates/lang-table',
 106                    '/mnt/source/RHupdates/lang-table', '/etc/lang-table',
 107 -                  '/usr/lib/anaconda/lang-table')
 108 +                  '/usr/%s/anaconda/lang-table' % sys.lib)
 109          for path in search:
 110              if os.access(path, os.R_OK):
 111                  f = open(path, "r")
 112 --- anaconda-11.0.5/iw/release_notes_viewer_gui.py~     2006-01-25 21:51:18.000000000 +0200
 113 +++ anaconda-11.0.5/iw/release_notes_viewer_gui.py      2006-05-19 00:29:16.000000000 +0300
 114 @@ -20,7 +20,7 @@
 115
 116  from rhpl.translate import _, N_
 117
 118 -sys.path.append('/usr/lib/anaconda')
 119 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 120
 121  from gui import TextViewBrowser, addFrame
 122
 123 --- anaconda-11.0.5/scripts/pkgorder~   2006-05-19 00:12:16.000000000 +0300
 124 +++ anaconda-11.0.5/scripts/pkgorder    2006-05-19 00:29:50.000000000 +0300
 125 @@ -23,7 +23,7 @@
 126  handler.setLevel(logging.ERROR)
 127  logger.addHandler(handler)
 128
 129 -sys.path.append("/usr/lib/anaconda")
 130 +sys.path.append("/usr/%s/anaconda" % sys.lib)
 131
 132  from optparse import OptionParser
 133  from repomd.packageSack import PackageSack
 134 --- anaconda-11.0.5/loader2/loader.c~   2006-03-06 21:45:27.000000000 +0200
 135 +++ anaconda-11.0.5/loader2/loader.c    2006-05-19 00:31:17.000000000 +0300
 136 @@ -292,6 +292,8 @@
 137              setenv("PYTHONSTARTUP", "/tmp/updates/pyrc.py", 1);
 138          else if (!access("/usr/lib/anaconda-runtime/pyrc.py", R_OK|X_OK))
 139              setenv("PYTHONSTARTUP", "/usr/lib/anaconda-runtime/pyrc.py", 1);
 140 +        else if (!access("/usr/lib64/anaconda-runtime/pyrc.py", R_OK|X_OK))
 141 +            setenv("PYTHONSTARTUP", "/usr/lib64/anaconda-runtime/pyrc.py", 1);
 142          setenv("LD_LIBRARY_PATH", LIBPATH, 1);
 143          setenv("LANG", "C", 1);
 144
 145 --- anaconda-11.0.5/gui.py~     2006-02-14 21:23:59.000000000 +0200
 146 +++ anaconda-11.0.5/gui.py      2006-05-19 00:31:53.000000000 +0300
 147 @@ -1124,7 +1124,7 @@
 148             # HACK to make release notes to work in test mode
 149             # also HACK to make it work from RHupdates
 150             for dir in ("iw/", "/mnt/source/RHupdates/",
 151 -                        "/usr/lib/anaconda/iw/"):
 152 +                        ("/usr/%s/anaconda/iw/" % sys.lib)):
 153                 path = dir + "release_notes_viewer_gui.py"
 154                 if os.access(path, os.X_OK):
 155                         break
 156 --- anaconda-11.0.5/command-stubs/loadkeys-stub~        2004-05-12 00:52:00.000000000 +0300
 157 +++ anaconda-11.0.5/command-stubs/loadkeys-stub 2006-05-19 00:32:19.000000000 +0300
 158 @@ -7,7 +7,7 @@
 159  if (os.path.exists('isys')):
 160      sys.path.append('isys')
 161
 162 -sys.path.append('/usr/lib/anaconda')
 163 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 164
 165  import isys
 166
 167 --- anaconda-11.0.5/command-stubs/pump-stub~    2004-01-23 06:01:21.000000000 +0200
 168 +++ anaconda-11.0.5/command-stubs/pump-stub     2006-05-19 00:32:33.000000000 +0300
 169 @@ -7,7 +7,7 @@
 170  if (os.path.exists('isys')):
 171      sys.path.append('isys')
 172
 173 -sys.path.append('/usr/lib/anaconda')
 174 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 175
 176  import isys
 177  from sys import argv
 178 --- anaconda-11.0.5/command-stubs/list-harddrives-stub~ 2002-08-16 09:07:59.000000000 +0300
 179 +++ anaconda-11.0.5/command-stubs/list-harddrives-stub  2006-05-19 00:32:59.000000000 +0300
 180 @@ -10,7 +10,7 @@
 181  if (os.path.exists('isys')):
 182      sys.path.append('isys')
 183
 184 -sys.path.append('/usr/lib/anaconda')
 185 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 186
 187  import parted
 188  import partedUtils
 189 --- anaconda-11.0.5/command-stubs/raidstart-stub~       2004-07-12 23:37:25.000000000 +0300
 190 +++ anaconda-11.0.5/command-stubs/raidstart-stub        2006-05-19 00:33:13.000000000 +0300
 191 @@ -12,7 +12,7 @@
 192      sys.path.append('gnome-map')
 193      sys.path.append('isys')
 194
 195 -sys.path.append('/usr/lib/anaconda')
 196 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 197
 198  import fsset
 199  import raid
 200 --- anaconda-11.0.5/command-stubs/losetup-stub~ 2001-02-20 21:48:12.000000000 +0200
 201 +++ anaconda-11.0.5/command-stubs/losetup-stub  2006-05-19 00:33:27.000000000 +0300
 202 @@ -7,7 +7,7 @@
 203  if (os.path.exists('isys')):
 204      sys.path.append('isys')
 205
 206 -sys.path.append('/usr/lib/anaconda')
 207 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 208
 209  import isys
 210  from sys import argv
 211 --- anaconda-11.0.5/command-stubs/mknod-stub~   2004-12-20 23:20:08.000000000 +0200
 212 +++ anaconda-11.0.5/command-stubs/mknod-stub    2006-05-19 00:33:39.000000000 +0300
 213 @@ -1,7 +1,7 @@
 214  #!/usr/bin/python
 215
 216  import sys
 217 -sys.path.append('/usr/lib/anaconda')
 218 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 219  import isys
 220  import string
 221  import stat
 222 --- anaconda-11.0.5/command-stubs/raidstop-stub~        2004-07-12 23:37:25.000000000 +0300
 223 +++ anaconda-11.0.5/command-stubs/raidstop-stub 2006-05-19 00:33:50.000000000 +0300
 224 @@ -12,7 +12,7 @@
 225      sys.path.append('gnome-map')
 226      sys.path.append('isys')
 227
 228 -sys.path.append('/usr/lib/anaconda')
 229 +sys.path.append('/usr/%s/anaconda' % sys.lib)
 230
 231  import fsset
 232  import raid