--- a/components/python/markdown/markdown-PYVER.p5m Mon Jan 27 15:13:46 2014 -0800
+++ b/components/python/markdown/markdown-PYVER.p5m Mon Jan 27 17:48:58 2014 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/markdown-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/markdown-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python implementation of John Gruber's Markdown"
set name=pkg.description \
value="Markdown is an implementation of John Gruber's Markdown parser that follows the syntax rules and the behavior of the original (markdown.pl) implementation and which is suited to use in web server environments (such that it never raises an exception, never writes to standard output, etc.) It provides an Extension API which makes it possible to change and/or extend the behavior of the parser."
@@ -73,7 +73,11 @@
# force a dependency on the markdown package
depend type=require \
- fmri=library/python-2/markdown@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/markdown@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on pygments; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pygments-$(PYV)
+depend type=require fmri=library/python/pygments-$(PYV)
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/markdown-$(PYV)@2.3.1,5.12-5.12.0.0.0.41.0