From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 1 Oct 2020 19:08:16 +0000 (+0200)
Subject: - convert python '~=' deps to '>='
X-Git-Tag: auto/th/rpm-5.4.15-59
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=0e78e3b771aec2ba40ef08d3540ece89454f2024;p=packages%2Frpm.git

- convert python '~=' deps to '>='
- rel 59
---

diff --git a/rpm-pythoneggs.patch b/rpm-pythoneggs.patch
index 06eef43..4930b81 100644
--- a/rpm-pythoneggs.patch
+++ b/rpm-pythoneggs.patch
@@ -62,7 +62,7 @@
              deps = dist.requires()
              if Suggests:
                  depsextras = dist.requires(extras=dist.extras)
-@@ -153,15 +172,20 @@ for f in files:
+@@ -153,15 +172,23 @@ for f in files:
                          if dep in deps:
                              depsextras.remove(dep)
                  deps = depsextras
@@ -80,9 +80,24 @@
                              py_deps[name] = []
 -                        if not spec in py_deps[name]:
 -                            py_deps[name].append(spec)
-+                        plddep = (spec[0], make_pldver(spec[1]))
++                        if spec[0] == '~=':
++                            plddep = ('>=', make_pldver(spec[1]))
++                        else:
++                            plddep = (spec[0], make_pldver(spec[1]))
 +                        if not plddep in py_deps[name]:
 +                            py_deps[name].append(plddep)
                  if not dep.specs:
                      py_deps[name] = []
          # Unused, for automatic sub-package generation based on 'extras' from egg metadata
+@@ -208,7 +211,10 @@
+                         if spec[0] == '!=':
+                             print 'Conflicts:\t%s %s %s' % (dep.key, '==', spec[1])
+                         else:
+-                            print 'Requires:\t%s %s %s' % (dep.key, spec[0], spec[1])
++                            if spec[0] == '~=':
++                                print 'Requires:\t%s %s %s' % (dep.key, '>=', spec[1])
++                            else:
++                                print 'Requires:\t%s %s %s' % (dep.key, spec[0], spec[1])
+                 print '%%description\t%s' % extra
+                 print '%s extra for %s python egg' % (extra, dist.key)
+                 print '%%files\t\textras-%s\n' % extra
diff --git a/rpm.spec b/rpm.spec
index f9d228c..40cbcac 100644
--- 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
-Release:	58
+Release:	59
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm