--- a/components/python/simplejson/simplejson-PYVER.p5m Tue Apr 07 15:49:29 2015 -0700
+++ b/components/python/simplejson/simplejson-PYVER.p5m Tue Apr 07 13:31:20 2015 -0700
@@ -26,7 +26,9 @@
set name=pkg.fmri \
value=pkg:/library/python/simplejson-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
- value="JSON (Java Script Object Notation) encoder/decoder for Python"
+ value="JSON (JavaScript Object Notation) encoder/decoder for Python"
+set name=pkg.description \
+ value="The simplejson module is a simple, fast, complete, correct, and extensible JSON encoder and decoder for Python. The encoder can be specialized to provide serialization in any kind of situation, without any special support by the objects to be serialized (somewhat like pickle). The decoder can handle incoming JSON strings of any specified encoding (UTF-8 by default). It can also be specialized to post-process JSON objects, which is particularly useful for implementing protocols such as JSON-RPC that have a richer type system than JSON itself."
set name=com.oracle.info.description value="the JSON encoder/decoder for Python"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
@@ -35,39 +37,22 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=LSARC/2008/722
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson-2.1.2-py$(PYVER).egg-info/PKG-INFO
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson-2.1.2-py$(PYVER).egg-info/SOURCES.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson-2.1.2-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson-2.1.2-py$(PYVER).egg-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson-2.1.2-py$(PYVER).egg-info/zip-safe
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/simplejson-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/simplejson-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/simplejson-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/simplejson-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/64/_speedups.so
file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/_speedups.so
+$(PYTHON_2.6_ONLY)file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/_speedups.so
+$(PYTHON_2.7_ONLY)file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/_speedups.so
+file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/compat.py
file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/decoder.py
file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/encoder.py
file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/ordered_dict.py
file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/scanner.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_check_circular.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_decimal.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_decode.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_default.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_dump.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_encode_basestring_ascii.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_encode_for_html.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_errors.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_fail.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_float.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_indent.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_pass1.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_pass2.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_pass3.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_recursion.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_scanstring.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_separators.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_speedups.py
-file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tests/test_unicode.py
file path=usr/lib/python$(PYVER)/vendor-packages/simplejson/tool.py
+#
license simplejson.license license=MIT
# simplejson was previously in the 'desktop' consolidation. This optional