- rel 46; missing import

diff --git a/rpm-pythoneggs.patch b/rpm-pythoneggs.patch
index dc8e3df7076e29c5193c05b3827f87f340d6fdaf..15c848dfdbc38721ae03e6ddbeafcb84962d4e21 100644 (file)
--- a/rpm-pythoneggs.patch
+++ b/rpm-pythoneggs.patch
@@ -1,15 +1,16 @@
 --- rpm-5.4.15.org/scripts/pythoneggs.py       2012-05-08 00:39:11.000000000 +0200
 --- rpm-5.4.15.org/scripts/pythoneggs.py       2012-05-08 00:39:11.000000000 +0200

-+++ rpm-5.4.15/scripts/pythoneggs.py   2018-09-27 10:23:33.011831652 +0200
-@@ -16,7 +16,7 @@ from pkg_resources import Distribution,
++++ rpm-5.4.15/scripts/pythoneggs.py   2018-09-27 10:32:34.661059061 +0200
+@@ -16,7 +16,8 @@ from pkg_resources import Distribution,

  from distutils.sysconfig import get_python_lib
  from subprocess import Popen, PIPE, STDOUT
  import os
 -
  from distutils.sysconfig import get_python_lib
  from subprocess import Popen, PIPE, STDOUT
  import os
 -

++import platform

 +import re
  
  opts, args = getopt(argv[1:], 'hPRSCOEb:',
          ['help', 'provides', 'requires', 'suggests', 'conflicts', 'obsoletes', 'extras','buildroot='])
 +import re
  
  opts, args = getopt(argv[1:], 'hPRSCOEb:',
          ['help', 'provides', 'requires', 'suggests', 'conflicts', 'obsoletes', 'extras','buildroot='])

-@@ -29,6 +29,13 @@ Obsoletes = False
+@@ -29,6 +30,13 @@ Obsoletes = False

  Extras = False
  buildroot = None
  
  Extras = False
  buildroot = None
  


@@ -23,7 +24,7 @@
  for o, a in opts:
      if o in ('-h', '--help'):
          print '-h, --help\tPrint help'
  for o, a in opts:
      if o in ('-h', '--help'):
          print '-h, --help\tPrint help'

-@@ -125,11 +132,14 @@ for f in files:
+@@ -125,11 +133,14 @@ for f in files:

                  if not name in py_deps:
                      py_deps[name] = []
                  py_deps[name].append(('==', dist.py_version))
                  if not name in py_deps:
                      py_deps[name] = []
                  py_deps[name].append(('==', dist.py_version))


@@ -40,7 +41,7 @@
                  if not spec in py_deps[name]:
                      py_deps[name].append(spec)
          if Requires or (Suggests and dist.extras):
                  if not spec in py_deps[name]:
                      py_deps[name].append(spec)
          if Requires or (Suggests and dist.extras):

-@@ -145,6 +155,14 @@ for f in files:
+@@ -145,6 +156,14 @@ for f in files:

                  spec = ('==', dist.py_version)
                  if not spec in py_deps[name]:
                      py_deps[name].append(spec)
                  spec = ('==', dist.py_version)
                  if not spec in py_deps[name]:
                      py_deps[name].append(spec)


@@ -55,7 +56,7 @@
              deps = dist.requires()
              if Suggests:
                  depsextras = dist.requires(extras=dist.extras)
              deps = dist.requires()
              if Suggests:
                  depsextras = dist.requires(extras=dist.extras)

-@@ -153,15 +171,20 @@ for f in files:
+@@ -153,15 +172,20 @@ for f in files:

                          if dep in deps:
                              depsextras.remove(dep)
                  deps = depsextras
                          if dep in deps:
                              depsextras.remove(dep)
                  deps = depsextras

diff --git a/rpm.spec b/rpm.spec
index d78672a9d5d0ed786a8e8984eb057d7760b24ca6..ada96ebe22ef00ece11e28e4f8e7ac0c1700d7aa 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -47,7 +47,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.15
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.15

-Release:       46
+Release:       47

 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm