--- a/components/python/nose/nose-PYVER.p5m Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/nose/nose-PYVER.p5m Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# 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/nose-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/nose-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="A unittest-based testing framework for python that makes writing and running tests easier"
set name=com.oracle.info.description value="the Python nose unit test framework"
@@ -97,4 +97,7 @@
# force a dependency on the nose package
depend type=require \
- fmri=library/python-2/nose@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/nose@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/nose-$(PYV)@1.2.1,5.12-5.12.0.0.0.41.0