From 75024bb9aa48b2714bb0ca6cd1aee4d2c69c813b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 27 Sep 2018 10:33:41 +0200 Subject: [PATCH 1/1] - rel 46; missing import --- rpm-pythoneggs.patch | 13 +++++++------ rpm.spec | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rpm-pythoneggs.patch b/rpm-pythoneggs.patch index dc8e3df..15c848d 100644 --- 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/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 - ++import platform +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 @@ -23,7 +24,7 @@ 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)) @@ -40,7 +41,7 @@ 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) @@ -55,7 +56,7 @@ 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 diff --git a/rpm.spec b/rpm.spec index d78672a..ada96eb 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: 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 -- 2.43.0