--- a/components/python/twisted/twisted-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/twisted/twisted-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,13 +20,14 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/python-twisted-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/python-twisted-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Event-based framework for internet applications"
-set name=com.oracle.info.description value="the Twisted event-based Python framework"
+set name=com.oracle.info.description \
+ value="the Twisted event-based Python framework"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
@@ -917,11 +918,15 @@
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/python-twisted-$(PYV)@10.1.0,5.11-0.175.3.0.0.16.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 python-twisted package
depend type=require \
- fmri=library/python-2/python-twisted@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-depend type=require fmri=library/python-2/python-zope-interface-$(PYV)
+ fmri=library/python/python-twisted@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+depend type=require fmri=library/python/python-zope-interface-$(PYV)