--- a/components/net-snmp/net-snmp-26.p5m	Wed Jan 28 11:07:54 2015 -0800
+++ b/components/net-snmp/net-snmp-26.p5m	Wed Jan 28 08:53:43 2015 -0800
@@ -18,38 +18,38 @@
 #
 # 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/net-snmp-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/net-snmp-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Net-SNMP - Python 2.6 bindings"
 set name=com.oracle.info.description value="Python 2.6 bindings for Net-SNMP"
+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=LSARC/2008/355
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=com.oracle.info.tpno value=$(TPNO)
-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/netsnmp
-dir path=usr/lib/python2.6/vendor-packages/netsnmp/tests
-dir path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info
+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/netsnmp
 file path=usr/lib/python2.6/vendor-packages/netsnmp/__init__.py
 file path=usr/lib/python2.6/vendor-packages/netsnmp/client.py
 file path=usr/lib/python2.6/vendor-packages/netsnmp/client_intf.so
+dir  path=usr/lib/python2.6/vendor-packages/netsnmp/tests
 file path=usr/lib/python2.6/vendor-packages/netsnmp/tests/__init__.py
 file path=usr/lib/python2.6/vendor-packages/netsnmp/tests/test.py
-file \
-    path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/PKG-INFO
-file \
-    path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/SOURCES.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/dependency_links.txt
-file \
-    path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/top_level.txt
+dir  path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/top_level.txt
 license COPYING license="BSD, BSD-like"
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0