--- a/components/python/pycups/pycups.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pycups/pycups.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,23 +18,26 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/library/python-2/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/python/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for CUPS"
-set name=com.oracle.info.description value="the Python language bindings for CUPS"
+set name=com.oracle.info.description \
+ value="the Python language bindings for CUPS"
set name=info.classification value=org.opensolaris.category.2008:System/Printing
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=PSARC/2008/273
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-depend fmri=library/python-2/pycups-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
+depend type=conditional \
+ fmri=library/python/pycups-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
+depend type=conditional \
+ fmri=library/python/pycups-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27
-depend fmri=library/python-2/pycups-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
+# 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