diff -r 9e945128be3b -r 69d14d547e77 components/python/pytz/pytz-PYVER.p5m --- a/components/python/pytz/pytz-PYVER.p5m Mon Jan 27 15:13:46 2014 -0800 +++ b/components/python/pytz/pytz-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/pytz-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) + value=pkg:/library/python/pytz-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="Python time zone library" set name=pkg.description \ value="This library allows accurate and cross-platform timezone calculations using Python 2.4 or higher and provides access to the Olson timezone database. It also solves the issue of ambiguous times at the end of daylight savings." @@ -51,13 +51,17 @@ # license LICENSE.txt license=MIT +# force the rename with an optional dependency on the old name +depend type=optional \ + fmri=library/python-2/pytz-$(PYV)@2013.4,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 pytz package depend type=require \ - fmri=library/python-2/pytz@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) + fmri=library/python/pytz@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) # Pull in the timezone database depend type=require fmri=system/data/timezone