rpms/nodejs20
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't write pointless 'npm(foo) > 0' deps

Browse Source
This commit is contained in:
T.C. Hollingsworth 2013-01-09 18:44:46 -07:00
parent 5dd35b8cd5
commit 8792574c0a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nodejs.req
View File

@ -54,7 +54,7 @@ def main():
if 'engines' in metadata and 'node' in metadata['engines']: if 'engines' in metadata and 'node' in metadata['engines']:
deps += process_dep(req, metadata['engines']['node']) deps += process_dep(req, metadata['engines']['node'])
else: else:
print req deps += req
if 'dependencies' in metadata: if 'dependencies' in metadata:
for name, version in metadata['dependencies'].iteritems(): for name, version in metadata['dependencies'].iteritems():
@ -119,7 +119,8 @@ def convert_dep(req, operator, version):
# 1 or 1.x or 1.x.x or ~1 # 1 or 1.x or 1.x.x or ~1
if len(parts) == 1 or parts[1] == 'x': if len(parts) == 1 or parts[1] == 'x':
deps.append('{0} >= {1}'.format(req, parts[0])) if parts[0] != 0:
deps.append('{0} >= {1}'.format(req, parts[0]))
deps.append('{0} < {1}'.format(req, parts[0]+1)) deps.append('{0} < {1}'.format(req, parts[0]+1))
# 1.2.3 or 1.2.3-4 or 1.2.x or ~1.2.3 or 1.2 # 1.2.3 or 1.2.3-4 or 1.2.x or ~1.2.3 or 1.2

1
nodejs.spec
View File

@ -166,6 +166,7 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
- add defines to match libuv (#892601) - add defines to match libuv (#892601)
- make v8 dependency explicit (and thus more accurate) - make v8 dependency explicit (and thus more accurate)
- add -g to $C(XX)FLAGS instead of patching configure to add it - add -g to $C(XX)FLAGS instead of patching configure to add it
- don't write pointless 'npm(foo) > 0' deps
* Sat Jan 05 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.9.5-4 * Sat Jan 05 2013 T.C. Hollingsworth <tchollingsworth@gmail.com> - 0.9.5-4
- install development headers - install development headers