--- a/components/python/glanceclient/glanceclient-PYVER.p5m Thu Apr 16 01:36:32 2015 -0700
+++ b/components/python/glanceclient/glanceclient-PYVER.p5m Mon Apr 20 12:35:51 2015 -0700
@@ -23,17 +23,15 @@
# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
#
-# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/glanceclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
- value="Python and command-line clients for the OpenStack Glance API"
+ value="Python and command-line clients for the OpenStack Images API"
set name=pkg.description \
value="A client library for Glance built on the OpenStack Images API. It provides a Python API (the 'glanceclient' module) and a command-line tool ('glance'). This library fully supports the v1 Images API, while support for the v2 API is in progress."
set name=com.oracle.info.description \
value="glanceclient, the Python bindings to the OpenStack Images API"
-set name=com.oracle.info.tpno value=16348
+set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python \
value="org.opensolaris.category.2008:System/Administration and Configuration" \
@@ -45,6 +43,7 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
link path=usr/bin/glance target=glance-$(PYVER) mediator=python \
mediator-version=$(PYVER)
+#
file path=usr/bin/glance-$(PYVER)
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/client.py
@@ -52,11 +51,18 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/common/base.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/common/exceptions.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/common/http.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/common/https.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/common/progressbar.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/common/utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/exc.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/common/apiclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/common/apiclient/auth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/common/apiclient/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/common/apiclient/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/common/apiclient/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/common/apiclient/fake_client.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/common/gettextutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/common/importutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/openstack/common/strutils.py
@@ -65,15 +71,16 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v1/client.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v1/image_members.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v1/images.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v1/legacy_shell.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v1/shell.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/client.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/image_members.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/image_tags.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/images.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/metadefs.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/schemas.py
file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glanceclient/v2/tasks.py
file path=usr/lib/python$(PYVER)/vendor-packages/python_glanceclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/python_glanceclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/python_glanceclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
@@ -81,23 +88,36 @@
file path=usr/lib/python$(PYVER)/vendor-packages/python_glanceclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
file path=usr/lib/python$(PYVER)/vendor-packages/python_glanceclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/python_glanceclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+#
license glanceclient.license license="Apache v2.0"
# force a group dependency on the optional eventlet; pkgdepend work is needed to
# flush this out.
depend type=group fmri=library/python-2/eventlet-$(PYV)
+# force a group dependency on the optional simplejson; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python-2/simplejson-$(PYV)
+
# force a dependency on argparse; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/argparse-$(PYV)
+# force a dependency on the glanceclient package
+depend type=require \
+ fmri=library/python/glanceclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
# force a dependency on jsonpatch; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/jsonpatch-$(PYV)
-# force a dependency on netaddr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/netaddr-$(PYV)
+# force a dependency on keystoneclient; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/keystoneclient-$(PYV)
+
+# force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.utils-$(PYV)
# force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pbr-$(PYV)
+depend type=require fmri=library/python/pbr-$(PYV)
# force a dependency on prettytable; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/prettytable-$(PYV)
@@ -105,16 +125,17 @@
# force a dependency on pyopenssl; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/pyopenssl-$(PYV)
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/requests-$(PYV)
+
# force a dependency on six; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/six-$(PYV)
+depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/stevedore-$(PYV)
# force a dependency on warlock; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/warlock-$(PYV)
-# force a dependency on the glanceclient package
-depend type=require \
- fmri=library/python/glanceclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# force a dependency on keystoneclient; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python/keystoneclient-$(PYV)
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python-2/babel-$(PYV)