[nodejs/f18] don't write pointless 'npm(foo) > 0' deps
T.C. Hollingsworth
patches at fedoraproject.org
Thu Jan 10 05:18:41 UTC 2013
commit 8792574c0ad0b328dbe11bac4360be89b8d89f49
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date: Wed Jan 9 18:44:46 2013 -0700
don't write pointless 'npm(foo) > 0' deps
nodejs.req | 5 +++--
nodejs.spec | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/nodejs.req b/nodejs.req
index fdb710f..14c59e5 100755
--- a/nodejs.req
+++ b/nodejs.req
@@ -54,7 +54,7 @@ def main():
if 'engines' in metadata and 'node' in metadata['engines']:
deps += process_dep(req, metadata['engines']['node'])
else:
- print req
+ deps += req
if 'dependencies' in metadata:
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
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))
# 1.2.3 or 1.2.3-4 or 1.2.x or ~1.2.3 or 1.2
diff --git a/nodejs.spec b/nodejs.spec
index d4a6778..49330ff 100644
--- a/nodejs.spec
+++ b/nodejs.spec
@@ -166,6 +166,7 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
- add defines to match libuv (#892601)
- make v8 dependency explicit (and thus more accurate)
- 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 at gmail.com> - 0.9.5-4
- install development headers
More information about the scm-commits
mailing list