# HG changeset patch # User david.comay@oracle.com # Date 1429898108 25200 # Node ID 1f94830c259d132faf7d0c114edaef0260f7ff39 # Parent 85f3f56a012c2fa035d697a478232fdc6e89f144 20934542 pyyaml is missing a runtime and an unversioned dependency diff -r 85f3f56a012c -r 1f94830c259d components/python/pyyaml/pyyaml-PYVER.p5m --- a/components/python/pyyaml/pyyaml-PYVER.p5m Fri Apr 24 10:54:36 2015 -0700 +++ b/components/python/pyyaml/pyyaml-PYVER.p5m Fri Apr 24 10:55:08 2015 -0700 @@ -20,8 +20,9 @@ # # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # + set name=pkg.fmri \ value=pkg:/library/python/pyyaml-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="a YAML parser and emitter for the Python language" @@ -57,7 +58,15 @@ file path=usr/lib/python$(PYVER)/vendor-packages/yaml/tokens.py # license LICENSE license=MIT -# + # force the rename with an optional dependency on the old name $(PYTHON_2.6_ONLY)depend type=optional \ fmri=library/python-2/pyyaml-$(PYV)@3.9,5.12-5.12.0.0.0.63.0 + +# force a dependency on the Python runtime +depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \ + pkg.debug.depend.path=usr/bin + +# force a dependency on the pyyaml package +depend type=require \ + fmri=library/python/pyyaml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)