rpm-pythoneggs.patch

   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-01-29 12:59:00.000000000 +0100
   3 @@ -16,7 +16,7 @@
   4  from distutils.sysconfig import get_python_lib
   5  from subprocess import Popen, PIPE, STDOUT
   6  import os
   7 -
   8 +import re
   9
  10  opts, args = getopt(argv[1:], 'hPRSCOEb:',
  11          ['help', 'provides', 'requires', 'suggests', 'conflicts', 'obsoletes', 'extras','buildroot='])
  12 @@ -29,6 +29,13 @@
  13  Extras = False
  14  buildroot = None
  15
  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)
  19 +    else:
  20 +       pldver = raw
  21 +    return pldver
  22 +
  23  for o, a in opts:
  24      if o in ('-h', '--help'):
  25          print '-h, --help\tPrint help'
  26 @@ -129,7 +136,7 @@
  27              if not name in py_deps:
  28                  py_deps[name] = []
  29              if dist.version:
  30 -                spec = ('==', dist.version)
  31 +                spec = ('==', make_pldver(dist.version))
  32                  if not spec in py_deps[name]:
  33                      py_deps[name].append(spec)
  34          if Requires or (Suggests and dist.extras):
  35 @@ -160,8 +167,9 @@
  36                      if spec[0] != '!=':
  37                          if not name in py_deps:
  38                              py_deps[name] = []
  39 -                        if not spec in py_deps[name]:
  40 -                            py_deps[name].append(spec)
  41 +                        plddep = (spec[0], make_pldver(spec[1]))
  42 +                        if not plddep in py_deps[name]:
  43 +                            py_deps[name].append(plddep)
  44                  if not dep.specs:
  45                      py_deps[name] = []
  46          # Unused, for automatic sub-package generation based on 'extras' from egg metadata