1 --- anaconda/Makefile.inc.org 2007-02-20 21:29:51.230623000 +0100
2 +++ anaconda/Makefile.inc 2007-02-20 21:30:25.302623000 +0100
5 # define destination locations
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 PYVER := $(shell python -c 'import sys; print sys.version[0:3]')
13 PYTHON = python$(PYVER)
14 diff -ur anaconda-11.2.0.24/anaconda anaconda-11.2.0.24/anaconda
15 --- anaconda-11.2.0.24/anaconda 2007-02-01 23:55:38.000000000 +0100
16 +++ anaconda-11.2.0.24/anaconda 2007-02-20 18:15:06.726623000 +0100
18 "/tmp/updates/%s/%s" %(pypkg, f))
20 # get the libdir. *sigh*
21 - if os.access("/usr/lib64/python%s/site-packages/%s" %(pyver, pypkg),
24 - elif os.access("/usr/lib/python%s/site-packages/%s" %(pyver, pypkg),
28 - # If the directory doesn't exist, there's nothing to link over.
29 - # This happens if we forgot to include one of the above packages
30 - # in the image, for instance.
34 if os.access("/tmp/updates/%s" %(pypkg,), os.X_OK):
35 for f in os.listdir("/usr/%s/python%s/site-packages/%s" %(libdir,
37 sys.path.append('textw')
40 - sys.path.append('/usr/lib/anaconda')
41 - sys.path.append('/usr/lib/anaconda/textw')
42 - sys.path.append('/usr/lib/anaconda/iw')
43 + sys.path.append('/usr/%s/anaconda' % sys.lib)
44 + sys.path.append('/usr/%s/anaconda/textw' % sys.lib)
45 + sys.path.append('/usr/%s/anaconda/iw' % sys.lib)
47 if (os.path.exists('booty')):
48 sys.path.append('booty')
49 sys.path.append('booty/edd')
51 - sys.path.append('/usr/lib/booty')
52 + sys.path.append('/usr/%s/booty' % sys.lib)
54 sys.path.append('/usr/share/system-config-date')
58 for p in ('/mnt/source/RHupdates/pyrc.py', \
59 '/tmp/updates/pyrc.py', \
60 - '/usr/lib/anaconda-runtime/pyrc.py'):
61 + '/usr/%s/anaconda-runtime/pyrc.py' % sys.lib):
62 if os.access(p, os.R_OK|os.X_OK):
63 os.environ['PYTHONSTARTUP'] = p
65 diff -ur anaconda-11.2.0.24/command-stubs/list-harddrives-stub anaconda-11.2.0.24/command-stubs/list-harddrives-stub
66 --- anaconda-11.2.0.24/command-stubs/list-harddrives-stub 2006-06-22 19:18:11.000000000 +0200
67 +++ anaconda-11.2.0.24/command-stubs/list-harddrives-stub 2007-02-20 18:19:21.454623000 +0100
69 if (os.path.exists('isys')):
70 sys.path.append('isys')
72 -sys.path.append('/usr/lib/anaconda')
73 +sys.path.append('/usr/%s/anaconda' % sys.lib)
77 diff -ur anaconda-11.2.0.24/command-stubs/loadkeys-stub anaconda-11.2.0.24/command-stubs/loadkeys-stub
78 --- anaconda-11.2.0.24/command-stubs/loadkeys-stub 2004-05-11 23:52:00.000000000 +0200
79 +++ anaconda-11.2.0.24/command-stubs/loadkeys-stub 2007-02-20 18:18:48.482623000 +0100
81 if (os.path.exists('isys')):
82 sys.path.append('isys')
84 -sys.path.append('/usr/lib/anaconda')
85 +sys.path.append('/usr/%s/anaconda' % sys.lib)
89 diff -ur anaconda-11.2.0.24/command-stubs/losetup-stub anaconda-11.2.0.24/command-stubs/losetup-stub
90 --- anaconda-11.2.0.24/command-stubs/losetup-stub 2001-02-20 20:48:12.000000000 +0100
91 +++ anaconda-11.2.0.24/command-stubs/losetup-stub 2007-02-20 18:19:53.858623000 +0100
93 if (os.path.exists('isys')):
94 sys.path.append('isys')
96 -sys.path.append('/usr/lib/anaconda')
97 +sys.path.append('/usr/%s/anaconda' % sys.lib)
101 diff -ur anaconda-11.2.0.24/command-stubs/mknod-stub anaconda-11.2.0.24/command-stubs/mknod-stub
102 --- anaconda-11.2.0.24/command-stubs/mknod-stub 2006-07-31 22:40:00.000000000 +0200
103 +++ anaconda-11.2.0.24/command-stubs/mknod-stub 2007-02-20 18:20:05.686623000 +0100
108 -sys.path.append('/usr/lib/anaconda')
109 +sys.path.append('/usr/%s/anaconda' % sys.lib)
113 diff -ur anaconda-11.2.0.24/command-stubs/raidstart-stub anaconda-11.2.0.24/command-stubs/raidstart-stub
114 --- anaconda-11.2.0.24/command-stubs/raidstart-stub 2006-03-28 18:49:14.000000000 +0200
115 +++ anaconda-11.2.0.24/command-stubs/raidstart-stub 2007-02-20 18:19:36.002623000 +0100
117 sys.path.append('gnome-map')
118 sys.path.append('isys')
120 -sys.path.append('/usr/lib/anaconda')
121 +sys.path.append('/usr/%s/anaconda' % sys.lib)
125 diff -ur anaconda-11.2.0.24/command-stubs/raidstop-stub anaconda-11.2.0.24/command-stubs/raidstop-stub
126 --- anaconda-11.2.0.24/command-stubs/raidstop-stub 2006-03-28 18:49:14.000000000 +0200
127 +++ anaconda-11.2.0.24/command-stubs/raidstop-stub 2007-02-20 18:20:21.294623000 +0100
129 sys.path.append('gnome-map')
130 sys.path.append('isys')
132 -sys.path.append('/usr/lib/anaconda')
133 +sys.path.append('/usr/%s/anaconda' % sys.lib)
137 diff -ur anaconda-11.2.0.24/command-stubs/syslogd-stub anaconda-11.2.0.24/command-stubs/syslogd-stub
138 --- anaconda-11.2.0.24/command-stubs/syslogd-stub 2006-05-01 18:39:15.000000000 +0200
139 +++ anaconda-11.2.0.24/command-stubs/syslogd-stub 2007-02-20 18:20:40.322623000 +0100
144 -sys.path.append('/usr/lib/anaconda')
145 +sys.path.append('/usr/%s/anaconda' % sys.lib)
148 sys.stderr.write("syslogd [root] [output file]")
149 diff -ur anaconda-11.2.0.24/installclass.py anaconda-11.2.0.24/installclass.py
150 --- anaconda-11.2.0.24/installclass.py 2007-02-06 17:14:43.000000000 +0100
151 +++ anaconda-11.2.0.24/installclass.py 2007-02-20 18:09:46.158623000 +0100
153 elif os.access("/tmp/product/installclasses", os.R_OK):
154 path = "/tmp/product/installclasses"
156 - path = "/usr/lib/anaconda/installclasses"
157 + path = "/usr/%s/anaconda/installclasses" % sys.lib
159 # append the location of installclasses to the python path so we
161 diff -ur anaconda-11.2.0.24/language.py anaconda-11.2.0.24/language.py
162 --- anaconda-11.2.0.24/language.py 2006-10-10 19:18:09.000000000 +0200
163 +++ anaconda-11.2.0.24/language.py 2007-02-20 18:09:46.158623000 +0100
165 from rhpl.simpleconfig import SimpleConfigFile
169 log = logging.getLogger("anaconda")
171 # Converts a single language into a "language search path". For example,
173 self.current = "en_US.UTF-8"
175 # English name -> native name mapping
176 - search = ('lang-names', '/usr/lib/anaconda/lang-names')
177 + search = ('lang-names', ('/usr/%s/anaconda/lang-names' % sys.lib))
179 if os.access(path, os.R_OK):
182 # nick -> (name, short name, font, keyboard, timezone) mapping
183 search = ('lang-table', '/tmp/updates/lang-table',
184 '/mnt/source/RHupdates/lang-table', '/etc/lang-table',
185 - '/usr/lib/anaconda/lang-table')
186 + '/usr/%s/anaconda/lang-table' % sys.lib)
188 if os.access(path, os.R_OK):
190 diff -ur anaconda-11.2.0.24/loader2/loader.c anaconda-11.2.0.24/loader2/loader.c
191 --- anaconda-11.2.0.24/loader2/loader.c 2007-02-13 17:52:22.000000000 +0100
192 +++ anaconda-11.2.0.24/loader2/loader.c 2007-02-20 18:17:47.146623000 +0100
194 setenv("PYTHONSTARTUP", "/tmp/updates/pyrc.py", 1);
195 else if (!access("/usr/lib/anaconda-runtime/pyrc.py", R_OK|X_OK))
196 setenv("PYTHONSTARTUP", "/usr/lib/anaconda-runtime/pyrc.py", 1);
197 + else if (!access("/usr/lib64/anaconda-runtime/pyrc.py", R_OK|X_OK))
198 + setenv("PYTHONSTARTUP", "/usr/lib64/anaconda-runtime/pyrc.py", 1);
199 setenv("LD_LIBRARY_PATH", LIBPATH, 1);
200 setenv("LANG", "C", 1);
202 diff -ur anaconda-11.2.0.24/scripts/pkgorder anaconda-11.2.0.24/scripts/pkgorder
203 --- anaconda-11.2.0.24/scripts/pkgorder 2007-01-30 23:26:15.000000000 +0100
204 +++ anaconda-11.2.0.24/scripts/pkgorder 2007-02-20 18:17:08.462623000 +0100
209 -sys.path.append("/usr/lib/anaconda")
210 -sys.path.append("/usr/lib/booty")
211 +sys.path.append("/usr/%s/anaconda" % sys.lib)
212 +sys.path.append("/usr/%s/booty" % sys.lib)