Fix up mako manifests oi_151a
authorJon Tibble <meths@btinternet.com>
Thu, 26 Apr 2012 10:23:45 +0100
branchoi_151a
changeset 283 a6d834388129
parent 282 1f6815d95a06
child 284 4eb91a81452f
Fix up mako manifests
components/python/mako/mako-26.p5m
components/python/mako/mako.p5m
--- a/components/python/mako/mako-26.p5m	Thu Apr 26 08:32:23 2012 +0100
+++ b/components/python/mako/mako-26.p5m	Thu Apr 26 10:23:45 2012 +0100
@@ -78,12 +78,4 @@
 file path=usr/lib/python2.6/vendor-packages/mako/template.py
 file path=usr/lib/python2.6/vendor-packages/mako/util.py
 
-# force a dependency on the Python 2.6 runtime
-#depend fmri=__TBD pkg.debug.depend.file=python2.6 \
-#       pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the mako package
-#depend fmri=library/python-2/mako@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-#    type=optional
-#    type=require
 depend fmri=runtime/python-26 type=require
--- a/components/python/mako/mako.p5m	Thu Apr 26 08:32:23 2012 +0100
+++ b/components/python/mako/mako.p5m	Thu Apr 26 10:23:45 2012 +0100
@@ -34,6 +34,4 @@
     desc="Mako is an embedded Python (i.e., Python Server Page) templating language." \
     name="Template library written in Python"
 
-depend fmri=library/python-2/mako-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
-    predicate=runtime/python-26 \
-    type=conditional
+depend fmri=library/python-2/mako-26 type=require