--- a/components/python/setuptools/setuptools-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/setuptools/setuptools-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,75 +18,78 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/library/python-2/setuptools-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
-set name=com.oracle.info.tpno value=$(TPNO)
+set name=pkg.fmri \
+ value=pkg:/library/python/setuptools-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="Download, build, install, upgrade, and uninstall Python packages easily"
set name=com.oracle.info.description value="Python setup tools"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
+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=http://pypi.python.org/pypi/setuptools
+set name=org.opensolaris.arc-caseid value=PSARC/2008/084
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2008/084
-
+link path=usr/bin/easy_install target=easy_install-$(PYVER) mediator=python \
+ mediator-version=$(PYVER)
+file path=usr/bin/easy_install-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/easy_install.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pkg_resources.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/archive_util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/cli.exe
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/alias.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_egg.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_rpm.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_wininst.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/build_ext.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/build_py.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/develop.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/easy_install.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/egg_info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_egg_info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_lib.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_scripts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/register.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/rotate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/saveopts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/sdist.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/setopt.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/test.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/upload.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/depends.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/dist.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/extension.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/gui.exe
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/package_index.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/sandbox.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/doctest.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/test_packageindex.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/test_resources.py
+file path=usr/lib/python$(PYVER)/vendor-packages/site.py
license setuptools.copyright license="PSF, ZPL"
-file path=usr/lib/python$(PYVER)/vendor-packages/easy_install.py
-file path=usr/lib/python$(PYVER)/vendor-packages/site.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pkg_resources.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/zip-safe
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/SOURCES.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/PKG-INFO
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/entry_points.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/sandbox.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/extension.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/package_index.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/depends.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/gui.exe
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/archive_util.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/dist.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/cli.exe
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/register.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/setopt.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/saveopts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/build_py.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_egg.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/develop.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/build_ext.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/upload.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/easy_install.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/test.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/rotate.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/sdist.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_lib.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_egg_info.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/egg_info.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_wininst.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/alias.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_rpm.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_scripts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/test_packageindex.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/test_resources.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/doctest.py
-file path=usr/bin/easy_install-$(PYVER)
-link path=usr/bin/easy_install target=easy_install-$(PYVER) \
- mediator=python mediator-version=$(PYVER)
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/setuptools-$(PYV)@0.6.11,5.11-0.175.3.0.0.16.0
# force a dependency on the Python $(PYVER) runtime
-depend fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
- pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+ pkg.debug.depend.path=usr/bin
# force a dependency on the setuptools package
-depend fmri=library/python-2/setuptools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
-
+depend type=require \
+ fmri=library/python/setuptools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)