--- a/components/python/python27/tkinter-27.p5m Wed Oct 08 05:29:12 2014 -0700
+++ b/components/python/python27/tkinter-27.p5m Mon Oct 06 13:15:36 2014 -0700
@@ -18,34 +18,27 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/tkinter-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/tkinter-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python 2.7 bindings to tcl/tk"
set name=com.oracle.info.description value="Python 2.7 bindings for Tcl/Tk"
-set name=com.oracle.info.tpno value=9104
+set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2011/XXX
+set name=org.opensolaris.arc-caseid value=PSARC/2008/514 value=PSARC/2009/529 \
+ value=PSARC/2014/183
+# PSARC 2008/514 Python interface to dlpi(7P)
+# PSARC 2009/529 Python interface to privileges(5) & rbac(5)
+# PSARC 2014/183 Python 2.7.6
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-#pkgdepend doesn't like python 2.7 yet
-<transform file path=.+\.py$ -> \
- default pkg.depend.bypass-generate .* >
-
license python27.license license=PSFv2
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/lib-dynload
-dir path=usr/lib/python2.7/lib-dynload/64
-dir path=usr/lib/python2.7/lib-tk
file path=usr/lib/python2.7/lib-dynload/64/_tkinter.so
file path=usr/lib/python2.7/lib-dynload/_tkinter.so
file path=usr/lib/python2.7/lib-tk/Canvas.py
@@ -66,3 +59,6 @@
file path=usr/lib/python2.7/lib-tk/tkSimpleDialog.py
file path=usr/lib/python2.7/lib-tk/ttk.py
file path=usr/lib/python2.7/lib-tk/turtle.py
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.2.3.0.5.0