Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
15805903 missing package dependencies in jsonrpclib
authorBrian Cameron <brian.cameron@oracle.com>
Thu, 11 Jul 2013 12:59:00 -0700
changeset 1391 5b61a66aa50c
parent 1390 c546954bc3a0
child 1392 812d4bf54f42
15805903 missing package dependencies in jsonrpclib
components/python/jsonrpclib/jsonrpclib-26.p5m file | annotate | diff | comparison | revisions
components/python/jsonrpclib/jsonrpclib-27.p5m file | annotate | diff | comparison | revisions
components/python/jsonrpclib/jsonrpclib-PYVER.p5m file | annotate | diff | comparison | revisions
components/python/jsonrpclib/jsonrpclib.p5m file | annotate | diff | comparison | revisions
components/python/jsonrpclib/resolve.deps file | annotate | diff | comparison | revisions 
--- a/components/python/jsonrpclib/jsonrpclib-26.p5m	Thu Jul 11 03:48:20 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/library/python-2/jsonrpclib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
-set name=com.oracle.info.description value="the Python 2.6 implementation of JSON-RPC v2.0"
-set name=com.oracle.info.tpno value=8061
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.upstream value="Josh Marshall <[email protected]>"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid value=PSARC/2012/198
-
-license jsonrpclib.license license='Apache v2.0'
-
-# force a dependency on the jsonrpclib package
-depend fmri=library/python-2/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-
-file \
-    path=usr/lib/python2.6/vendor-packages/jsonrpclib-$(COMPONENT_VERSION)-py2.6.egg-info
-file path=usr/lib/python2.6/vendor-packages/jsonrpclib/__init__.py
-file path=usr/lib/python2.6/vendor-packages/jsonrpclib/config.py
-file path=usr/lib/python2.6/vendor-packages/jsonrpclib/history.py
-file path=usr/lib/python2.6/vendor-packages/jsonrpclib/jsonclass.py
-file path=usr/lib/python2.6/vendor-packages/jsonrpclib/jsonrpc.py
-file path=usr/lib/python2.6/vendor-packages/jsonrpclib/SimpleJSONRPCServer.py
--- a/components/python/jsonrpclib/jsonrpclib-27.p5m	Thu Jul 11 03:48:20 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/library/python-2/jsonrpclib-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
-set name=com.oracle.info.description value="the Python 2.7 implementation of JSON-RPC v2.0"
-set name=com.oracle.info.tpno value=8061
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.upstream value="Josh Marshall <[email protected]>"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid value=PSARC/2012/198
-
-license jsonrpclib.license license='Apache v2.0'
-
-# force a dependency on the jsonrpclib package
-depend fmri=library/python-2/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    type=require
-
-file \
-    path=usr/lib/python2.7/vendor-packages/jsonrpclib-$(COMPONENT_VERSION)-py2.7.egg-info
-file path=usr/lib/python2.7/vendor-packages/jsonrpclib/__init__.py
-file path=usr/lib/python2.7/vendor-packages/jsonrpclib/config.py
-file path=usr/lib/python2.7/vendor-packages/jsonrpclib/history.py
-file path=usr/lib/python2.7/vendor-packages/jsonrpclib/jsonclass.py
-file path=usr/lib/python2.7/vendor-packages/jsonrpclib/jsonrpc.py
-file path=usr/lib/python2.7/vendor-packages/jsonrpclib/SimpleJSONRPCServer.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonrpclib/jsonrpclib-PYVER.p5m	Thu Jul 11 12:59:00 2013 -0700
@@ -0,0 +1,57 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python-2/jsonrpclib-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
+set name=pkg.description value="The jsonrpclib library is an implementation of the JSON-RPC specification. It supports both the original 1.0 specification, as well as the new (proposed) 2.0 spec, which includes features such as batch submission and keyword arguments. It is designed to be as compatible with the syntax of xmlrpclib as possible (it extends where possible), so that projects using xmlrpclib could easily be modified to use JSON and experiment with the differences."
+set name=com.oracle.info.description \
+    value="the Python $(PYVER) implementation of JSON-RPC v2.0"
+set name=com.oracle.info.tpno value=8061
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Josh Marshall <[email protected]>"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2012/198
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/SimpleJSONRPCServer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/config.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/history.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/jsonclass.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jsonrpclib/jsonrpc.py
+license jsonrpclib.license license="Apache v2.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 jsonrpclib package
+depend type=require \
+    fmri=library/python-2/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force dependency on simplejson; pkgdepend work is needed to flush these out. 
+depend type=require fmri=library/python-2/simplejson-$(PYV)
--- a/components/python/jsonrpclib/jsonrpclib.p5m	Thu Jul 11 03:48:20 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/library/python-2/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
-set name=com.oracle.info.description value="the Python implementation of JSON-RPC v2.0"
-set name=com.oracle.info.tpno value=8061
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.upstream value="Josh Marshall <[email protected]>"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-depend fmri=library/python-2/jsonrpclib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
-
-depend fmri=library/python-2/jsonrpclib-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-27 \
-    type=conditional
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonrpclib/resolve.deps	Thu Jul 11 12:59:00 2013 -0700
@@ -0,0 +1,2 @@
+runtime/python-26
+runtime/python-27
upstream/oracle/userland-gate