--- a/components/python/pylxml/pylxml.p5m Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pylxml/pylxml.p5m Fri Feb 24 13:30:24 2012 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, 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-2/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
set name=info.classification \
@@ -32,48 +32,11 @@
set name=org.opensolaris.arc-caseid \
value=PSARC/2009/579
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-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
-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
-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
-file path=usr/lib/python2.6/vendor-packages/lxml/__init__.py
-file path=usr/lib/python2.6/vendor-packages/lxml/_elementpath.py
-file path=usr/lib/python2.6/vendor-packages/lxml/builder.py
-file path=usr/lib/python2.6/vendor-packages/lxml/cssselect.py
-file path=usr/lib/python2.6/vendor-packages/lxml/doctestcompare.py
-file path=usr/lib/python2.6/vendor-packages/lxml/etree.so
-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
-file path=usr/lib/python2.6/vendor-packages/lxml/html/_diffcommand.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/_setmixin.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/builder.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/clean.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/defs.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/diff.py
-file path=usr/lib/python2.6/vendor-packages/lxml/html/formfill.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
-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
-file path=usr/lib/python2.6/vendor-packages/lxml/usedoctest.py
-license pylxml.copyright license="BSD, PSF, GPL"
+
+depend fmri=library/python-2/lxml-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26 \
+ type=conditional
+
+depend fmri=library/python-2/lxml-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27 \
+ type=conditional