--- a/components/python/django_compressor/django_compressor-PYVER.p5m Thu Apr 16 01:36:32 2015 -0700
+++ b/components/python/django_compressor/django_compressor-PYVER.p5m Mon Apr 20 12:35:51 2015 -0700
@@ -18,7 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -26,8 +28,8 @@
set name=pkg.summary value="JavaScript / CSS compressor"
set name=pkg.description \
value="Django Compressor combines and compresses linked and inline Javascript or CSS in a Django templates into cacheable static files."
-set name=com.oracle.info.description value="the django_compressor Python module"
-set name=com.oracle.info.tpno value=14503
+set name=com.oracle.info.description value="the Python django_compressor module"
+set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
@@ -36,6 +38,7 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2014/004
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/base.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/cache.py
@@ -51,6 +54,9 @@
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/css_default.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/cssmin/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/cssmin/cssmin.py
+file \
+ path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/cssmin/rcssmin.py \
+ pkg.depend.bypass-generate=.*/_rcssmin.*
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/csstidy.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/datauri.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/jsmin/__init__.py
@@ -59,6 +65,7 @@
pkg.depend.bypass-generate=.*/_rjsmin.*
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/jsmin/slimit.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/template.py
+file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/yuglify.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/filters/yui.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/finders.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/js.py
@@ -67,6 +74,9 @@
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/management/commands/compress.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/management/commands/mtime_cache.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/models.py
+file path=usr/lib/python$(PYVER)/vendor-packages/compressor/offline/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/compressor/offline/django.py
+file path=usr/lib/python$(PYVER)/vendor-packages/compressor/offline/jinja2.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/parser/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/parser/base.py
file path=usr/lib/python$(PYVER)/vendor-packages/compressor/parser/beautifulsoup.py
@@ -91,16 +101,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/django_compressor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
file path=usr/lib/python$(PYVER)/vendor-packages/django_compressor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/django_compressor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
+#
license django_compressor.license license="BSD, MIT, Apache 2.0"
+# force a group dependency on the optional lxml; pkgdepend work is needed to
+# flush this out
+depend type=group fmri=library/python-2/lxml-$(PYV)
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
-# force a dependency on beautifulsoup4; pkgdepend work is needed to
-# flush this out
-depend type=require fmri=library/python-2/beautifulsoup4-$(PYV)
-
# force a dependency on django; pkgdepend work is needed to flush this out
depend type=require fmri=library/python/django-$(PYV)
@@ -112,5 +123,5 @@
depend type=require \
fmri=library/python-2/django_compressor@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-# force a dependency on lxml; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/lxml-$(PYV)
+# force a dependency on jinja2; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/jinja2-$(PYV)