components/python/markupsafe/markupsafe-PYVER.p5m
changeset 1907 446472de62e9
parent 1666 69d14d547e77
child 1948 2d1537e7942d
--- a/components/python/markupsafe/markupsafe-PYVER.p5m	Mon May 19 10:28:03 2014 +0100
+++ b/components/python/markupsafe/markupsafe-PYVER.p5m	Mon May 19 07:37:20 2014 -0700
@@ -21,6 +21,9 @@
 # Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
+# Python 3 is 64-bit only, so 32-bit shared objects do not belong.
+<transform file path=usr/lib/python3.4/vendor-packages/markupsafe/_speedups.so -> drop>
+#
 set name=pkg.fmri \
     value=pkg:/library/python/markupsafe-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python HTML string module."
@@ -48,6 +51,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/markupsafe/_speedups.so
 license markupsafe.license license=BSD
 
+# force the rename with an optional dependency on the old name
+depend type=optional \
+    fmri=library/python-2/markupsafe-$(PYV)@0.18,5.12-5.12.0.0.0.41.0
+
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
@@ -55,7 +62,3 @@
 # force a dependency on the markupsafe package
 depend type=require \
     fmri=library/python/markupsafe@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# force the rename with an optional dependency on the old name
-depend type=optional \
-    fmri=library/python-2/markupsafe-$(PYV)@0.18,5.12-5.12.0.0.0.41.0