diff -r 9e945128be3b -r 69d14d547e77 components/python/anyjson/anyjson-PYVER.p5m --- a/components/python/anyjson/anyjson-PYVER.p5m Mon Jan 27 15:13:46 2014 -0800 +++ b/components/python/anyjson/anyjson-PYVER.p5m Mon Jan 27 17:48:58 2014 -0800 @@ -18,11 +18,11 @@ # # CDDL HEADER END # -# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri \ - value=pkg:/library/python-2/anyjson-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) + value=pkg:/library/python/anyjson-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary \ value="Python module wrapping the best available JSON implementation with a common interface" set name=pkg.description \ @@ -45,10 +45,13 @@ file path=usr/lib/python$(PYVER)/vendor-packages/anyjson/__init__.py license LICENSE license=BSD +# force the rename with an optional dependency on the old name +depend type=optional fmri=library/python-2/anyjson-$(PYV)@0.3.3,5.12-5.12.0.0.0.41.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 anyjson package depend type=require \ - fmri=library/python-2/anyjson@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) + fmri=library/python/anyjson@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)