From 25bdcc2c9f54874e6a43b65f7fb71cdb2c32e735 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 9 May 2013 13:27:41 +0200 Subject: [PATCH] - make pythoneggs generate differently named deps for python3 eggs - rel 53 --- rpm-pythoneggs.patch | 23 ++++++++++++++++++++--- rpm.spec | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/rpm-pythoneggs.patch b/rpm-pythoneggs.patch index 034926b..f328c88 100644 --- a/rpm-pythoneggs.patch +++ b/rpm-pythoneggs.patch @@ -1,5 +1,5 @@ --- rpm-5.4.10/scripts/pythoneggs.py.orig 2012-05-08 00:34:19.000000000 +0200 -+++ rpm-5.4.10/scripts/pythoneggs.py 2013-01-29 12:59:00.000000000 +0100 ++++ rpm-5.4.10/scripts/pythoneggs.py 2013-05-09 13:22:26.000000000 +0200 @@ -16,7 +16,7 @@ from distutils.sysconfig import get_python_lib from subprocess import Popen, PIPE, STDOUT @@ -23,7 +23,15 @@ for o, a in opts: if o in ('-h', '--help'): print '-h, --help\tPrint help' -@@ -129,7 +136,7 @@ +@@ -125,11 +132,14 @@ + if not name in py_deps: + py_deps[name] = [] + py_deps[name].append(('==', dist.py_version)) +- name = 'pythonegg(%s)' % dist.key ++ if dist.py_version .split(".")[0] == '3': ++ name = 'python3egg(%s)' % dist.key ++ else: ++ name = 'pythonegg(%s)' % dist.key if not name in py_deps: py_deps[name] = [] if dist.version: @@ -32,7 +40,16 @@ if not spec in py_deps[name]: py_deps[name].append(spec) if Requires or (Suggests and dist.extras): -@@ -160,8 +167,9 @@ +@@ -155,13 +165,17 @@ + deps = depsextras + # add requires/suggests based on egg metadata + for dep in deps: +- name = 'pythonegg(%s)' % dep.key ++ if dist.py_version .split(".")[0] == '3': ++ name = 'python3egg(%s)' % dep.key ++ else: ++ name = 'pythonegg(%s)' % dep.key + for spec in dep.specs: if spec[0] != '!=': if not name in py_deps: py_deps[name] = [] diff --git a/rpm.spec b/rpm.spec index 8b13a71..f7165e1 100644 --- a/rpm.spec +++ b/rpm.spec @@ -52,7 +52,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 5.4.10 -Release: 52 +Release: 53 License: LGPL v2.1 Group: Base # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm -- 2.43.0