--- a/components/python/pylxml/pylxml-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pylxml/pylxml-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,14 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, 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/lxml-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/lxml-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
-set name=com.oracle.info.description value="Python 2.6 bindings for the libxml2 and libxslt libraries"
+set name=com.oracle.info.description \
+ value="Python 2.6 bindings for the libxml2 and libxslt libraries"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
@@ -33,31 +34,22 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2009/579
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources
-dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/rng
-dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl
-dir \
- path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/lxml
-dir \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info
-dir path=usr/lib/python2.6/vendor-packages/lxml/64
-dir path=usr/lib/python2.6/vendor-packages/lxml/html
-dir path=usr/lib/python2.6/vendor-packages/lxml/isoschematron
-file \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/not-zip-safe
-file \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources
+dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/rng
+dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl
+dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/lxml
+dir path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/not-zip-safe
+file path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+dir path=usr/lib/python2.6/vendor-packages/lxml/64
file path=usr/lib/python2.6/vendor-packages/lxml/64/etree.so
file path=usr/lib/python2.6/vendor-packages/lxml/64/objectify.so
file path=usr/lib/python2.6/vendor-packages/lxml/ElementInclude.py
@@ -69,6 +61,7 @@
file path=usr/lib/python2.6/vendor-packages/lxml/etree.so
file path=usr/lib/python2.6/vendor-packages/lxml/etree_defs.h
file path=usr/lib/python2.6/vendor-packages/lxml/etreepublic.pxd
+dir path=usr/lib/python2.6/vendor-packages/lxml/html
file path=usr/lib/python2.6/vendor-packages/lxml/html/ElementSoup.py
file path=usr/lib/python2.6/vendor-packages/lxml/html/__init__.py
file path=usr/lib/python2.6/vendor-packages/lxml/html/_dictmixin.py
@@ -83,25 +76,17 @@
file path=usr/lib/python2.6/vendor-packages/lxml/html/html5parser.py
file path=usr/lib/python2.6/vendor-packages/lxml/html/soupparser.py
file path=usr/lib/python2.6/vendor-packages/lxml/html/usedoctest.py
+dir path=usr/lib/python2.6/vendor-packages/lxml/isoschematron
file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/__init__.py
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/rng/iso-schematron.rng
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/rng/iso-schematron.rng
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
file path=usr/lib/python2.6/vendor-packages/lxml/objectify.so
file path=usr/lib/python2.6/vendor-packages/lxml/pyclasslookup.py
file path=usr/lib/python2.6/vendor-packages/lxml/sax.py
@@ -109,6 +94,9 @@
file path=usr/lib/python2.6/vendor-packages/lxml/usedoctest.py
license pylxml.copyright license="BSD, PSF, GPL"
+# 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
+
# force a dependency on the lxml package
-depend fmri=library/python-2/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
+depend type=require \
+ fmri=library/python/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)