1 --- rpm-5.4.10/scripts/pythoneggs.py.orig 2012-05-08 00:34:19.000000000 +0200
2 +++ rpm-5.4.10/scripts/pythoneggs.py 2013-05-09 13:22:26.000000000 +0200
4 from distutils.sysconfig import get_python_lib
5 from subprocess import Popen, PIPE, STDOUT
10 opts, args = getopt(argv[1:], 'hPRSCOEb:',
11 ['help', 'provides', 'requires', 'suggests', 'conflicts', 'obsoletes', 'extras','buildroot='])
16 +def make_pldver(raw):
17 + if re.match(r'^[0-9\.]+$', raw) == None:
18 + pldver = re.sub(r'([\d\.]+)(.+)', r'\1-0.\2', raw)
24 if o in ('-h', '--help'):
25 print '-h, --help\tPrint help'
27 if not name in py_deps:
29 py_deps[name].append(('==', dist.py_version))
30 - name = 'pythonegg(%s)' % dist.key
31 + if dist.py_version .split(".")[0] == '3':
32 + name = 'python3egg(%s)' % dist.key
34 + name = 'pythonegg(%s)' % dist.key
35 if not name in py_deps:
38 - spec = ('==', dist.version)
39 + spec = ('==', make_pldver(dist.version))
40 if not spec in py_deps[name]:
41 py_deps[name].append(spec)
42 if Requires or (Suggests and dist.extras):
45 # add requires/suggests based on egg metadata
47 - name = 'pythonegg(%s)' % dep.key
48 + if dist.py_version .split(".")[0] == '3':
49 + name = 'python3egg(%s)' % dep.key
51 + name = 'pythonegg(%s)' % dep.key
52 for spec in dep.specs:
54 if not name in py_deps:
56 - if not spec in py_deps[name]:
57 - py_deps[name].append(spec)
58 + plddep = (spec[0], make_pldver(spec[1]))
59 + if not plddep in py_deps[name]:
60 + py_deps[name].append(plddep)
63 # Unused, for automatic sub-package generation based on 'extras' from egg metadata