diff -r 9c01a3410e89 -r 69ab8eca01c5 components/python/jsonrpclib/jsonrpclib-26.p5m
--- a/components/python/jsonrpclib/jsonrpclib-26.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/jsonrpclib/jsonrpclib-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,36 +18,40 @@
 #
 # 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/jsonrpclib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/python/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.description \
+    value="the Python 2.6 implementation of JSON-RPC v2.0"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+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 <catchjosh@gmail.com>"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 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
-
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/jsonrpclib
-file \
-    path=usr/lib/python2.6/vendor-packages/jsonrpclib-$(COMPONENT_VERSION)-py2.6.egg-info
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir  path=usr
+dir  path=usr/lib
+dir  path=usr/lib/python2.6
+dir  path=usr/lib/python2.6/vendor-packages
+dir  path=usr/lib/python2.6/vendor-packages/jsonrpclib
+file path=usr/lib/python2.6/vendor-packages/jsonrpclib-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/jsonrpclib/SimpleJSONRPCServer.py
 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
+license jsonrpclib.license license="Apache v2.0"
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/jsonrpclib-26@0.1.3,5.11-0.175.3.0.0.16.0
+
+# force a dependency on the jsonrpclib package
+depend type=require \
+    fmri=library/python/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)