--- a/components/libxml2/libxml2-26.p5m Mon Dec 15 11:16:57 2014 -0800
+++ b/components/libxml2/libxml2-26.p5m Fri Dec 12 04:00:07 2014 -0800
@@ -22,10 +22,10 @@
#
set name=pkg.fmri \
- value=pkg:/library/python-2/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XML library - Python 2.6 bindings"
set name=com.oracle.info.description value="Python 2.6 bindings for the XML library"
-set name=com.oracle.info.tpno value=17981
+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)
@@ -38,3 +38,6 @@
file path=usr/lib/python2.6/vendor-packages/libxml2.py
file path=usr/lib/python2.6/vendor-packages/libxml2mod.so
license libxml2.license license="libxml license"
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.2.6.0.3.0
--- a/components/libxml2/libxml2-27.p5m Mon Dec 15 11:16:57 2014 -0800
+++ b/components/libxml2/libxml2-27.p5m Fri Dec 12 04:00:07 2014 -0800
@@ -22,10 +22,10 @@
#
set name=pkg.fmri \
- value=pkg:/library/python-2/libxml2-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/libxml2-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XML library - Python 2.7 bindings"
set name=com.oracle.info.description value="Python 2.7 bindings for the XML library"
-set name=com.oracle.info.tpno value=17981
+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)
@@ -38,3 +38,6 @@
file path=usr/lib/python2.7/vendor-packages/libxml2.py
file path=usr/lib/python2.7/vendor-packages/libxml2mod.so
license libxml2.license license="libxml license"
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.2.6.0.3.0
--- a/components/libxml2/libxml2.p5m Mon Dec 15 11:16:57 2014 -0800
+++ b/components/libxml2/libxml2.p5m Fri Dec 12 04:00:07 2014 -0800
@@ -26,7 +26,7 @@
value=pkg:/library/libxml2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XML library"
set name=com.oracle.info.description value="the XML library"
-set name=com.oracle.info.tpno value=17981
+set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -110,10 +110,10 @@
link path=usr/lib/libxml2.so.2 target=../../lib/libxml2.so.2
link path=usr/lib/llib-lxml2.ln target=../../lib/llib-lxml2.ln
-depend fmri=library/python-2/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
predicate=runtime/python-26 \
type=conditional
-depend fmri=library/python-2/libxml2-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+depend fmri=library/python/libxml2-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
predicate=runtime/python-27 \
type=conditional
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxml2/old-manifest-26.p5m Fri Dec 12 04:00:07 2014 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.2.6.0.3.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/libxml2-26 type=require
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxml2/old-manifest-27.p5m Fri Dec 12 04:00:07 2014 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.2.6.0.3.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/python/libxml2-27 type=require