--- a/components/python/netaddr/netaddr-PYVER.p5m	Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/netaddr/netaddr-PYVER.p5m	Mon Jan 27 17:48:58 2014 -0800
@@ -20,11 +20,11 @@
 #
 
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/library/python-2/netaddr-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    value=pkg:/library/python/netaddr-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python network address manipulation"
 set name=pkg.description \
     value="The netaddr Python library represents and manipulates network addresses. It supports the ability to work and interact with the following: IPv4 and IPv6 addresses and subnets; MAC addresses, OUI and IAB identifiers, IEEE EUI-64 identifiers; arbitrary (non-aligned) IP address ranges and IP address sets; various non-CIDR IP range formats such as nmap and glob-style formats."
@@ -78,4 +78,8 @@
 #
 # force a dependency on the netaddr package
 depend type=require \
-    fmri=library/python-2/netaddr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    fmri=library/python/netaddr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/netaddr-$(PYV)@0.7.10,5.12-5.12.0.0.0.41.0