diff -r 9e945128be3b -r 69d14d547e77 components/python/python26/tkinter-26.p5m --- a/components/python/python26/tkinter-26.p5m Mon Jan 27 15:13:46 2014 -0800 +++ b/components/python/python26/tkinter-26.p5m Mon Jan 27 17:48:58 2014 -0800 @@ -18,12 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability uncommitted> set name=pkg.fmri \ - value=pkg:/library/python-2/tkinter-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) + value=pkg:/library/python/tkinter-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="Python bindings to tcl/tk" set name=com.oracle.info.description value="Python 2.6 bindings for Tcl/Tk" set name=com.oracle.info.tpno value=9104 @@ -55,3 +55,6 @@ file path=usr/lib/python2.6/lib-tk/tkSimpleDialog.py file path=usr/lib/python2.6/lib-tk/turtle.py license python26.license license=PSFv2 + +# force the rename with an optional dependency on the old name +depend type=optional fmri=library/python-2/tkinter-26@2.6.8,5.12-5.12.0.0.0.41.0