aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Samir <ahmad@mageia.org>2011-02-18 20:59:34 +0000
committerAhmad Samir <ahmad@mageia.org>2011-02-18 20:59:34 +0000
commit4aff6f287c977d32654cfe630cab30c4c693b4c3 (patch)
tree6daa226998014b5fa750b668c4da5b99ec3e7fa9
parentefdd34cdbca22815436aac5372204de459b3c5b3 (diff)
downloadrpm-setup-4aff6f287c977d32654cfe630cab30c4c693b4c3.tar
rpm-setup-4aff6f287c977d32654cfe630cab30c4c693b4c3.tar.gz
rpm-setup-4aff6f287c977d32654cfe630cab30c4c693b4c3.tar.bz2
rpm-setup-4aff6f287c977d32654cfe630cab30c4c693b4c3.tar.xz
rpm-setup-4aff6f287c977d32654cfe630cab30c4c693b4c3.zip
- merge svn rev. 271797 from Mandriva to make the python auto-requires always
lowercase
-rwxr-xr-xpythoneggs.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/pythoneggs.py b/pythoneggs.py
index b083555..1627cd2 100755
--- a/pythoneggs.py
+++ b/pythoneggs.py
@@ -92,7 +92,7 @@ for f in files:
if not name in py_deps:
py_deps[name] = []
py_deps[name].append(('==', dist.py_version))
- name = 'pythonegg(%s)' % dist.project_name
+ name = 'pythonegg(%s)' % dist.key
if not name in py_deps:
py_deps[name] = []
if dist.version:
@@ -122,7 +122,7 @@ for f in files:
deps = depsextras
# add requires/suggests based on egg metadata
for dep in deps:
- name = 'pythonegg(%s)' % dep.project_name
+ name = 'pythonegg(%s)' % dep.key
for spec in dep.specs:
if spec[0] != '!=':
if not name in py_deps:
@@ -139,7 +139,7 @@ for f in files:
print extras
for extra in extras:
print '%%package\textras-%s' % extra
- print 'Summary:\t%s extra for %s python egg' % (extra, dist.project_name)
+ print 'Summary:\t%s extra for %s python egg' % (extra, dist.key)
print 'Group:\t\tDevelopment/Python'
depsextras = dist.requires(extras=[extra])
for dep in reversed(depsextras):
@@ -149,18 +149,18 @@ for f in files:
for dep in deps:
for spec in dep.specs:
if spec[0] == '!=':
- print 'Conflicts:\t%s %s %s' % (dep.project_name, '==', spec[1])
+ print 'Conflicts:\t%s %s %s' % (dep.key, '==', spec[1])
else:
- print 'Requires:\t%s %s %s' % (dep.project_name, spec[0], spec[1])
+ 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.project_name)
+ print '%s extra for %s python egg' % (extra, dist.key)
print '%%files\t\textras-%s\n' % extra
if Conflicts:
# Should we really add conflicts for extras?
# Creating a meta package per extra with suggests on, which has
# the requires/conflicts in stead might be a better solution...
for dep in dist.requires(extras=dist.extras):
- name = dep.project_name
+ name = dep.key
for spec in dep.specs:
if spec[0] == '!=':
if not name in py_deps: